Skip to content

fix: Make storage location names compatible with server #3103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2019
Merged

fix: Make storage location names compatible with server #3103

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e0309e
Make storage location names compatible with server
abhinavk96 Jun 10, 2019
5da225e
Merge branch 'development' into fix-storage-settings
ritikamotwani Jun 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/templates/components/forms/admin/settings/system/storage-option.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</span>
</div>
<div class="field">
{{ui-radio label=(t 'Google Storage') name='storage' value='google' onChange=(action (mut settings.storagePlace))}}
{{ui-radio label=(t 'Google Storage') current=settings.storagePlace name='storage' value='gs' onChange=(action (mut settings.storagePlace))}}
<span class="small text">
({{t 'See'}}
<a href="https://cloud.google.com/storage/docs/migrating#defaultproj" target="_blank" rel="noopener nofollow">
Expand All @@ -20,7 +20,7 @@
{{t 'on how to obtain these keys.'}})
</span>
</div>
{{#if (eq settings.storagePlace 'google')}}
{{#if (eq settings.storagePlace 'gs')}}
<div class="field">
<label>
{{t 'Bucket name'}}
Expand All @@ -42,7 +42,7 @@
<div class="ui hidden divider"></div>
{{/if}}
<div class="field">
{{ui-radio label=(t 'Amazon S3') name='storage' value='S3' current=settings.storagePlace onChange=(action (mut settings.storagePlace))}}
{{ui-radio label=(t 'Amazon S3') name='storage' value='s3' current=settings.storagePlace onChange=(action (mut settings.storagePlace))}}
<span class="small text">
({{t 'See'}}
<a href="https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-getting-started.html" target="_blank" rel="noopener nofollow">
Expand All @@ -51,7 +51,7 @@
{{t 'on how to obtain these keys.'}})
</span>
</div>
{{#if (eq settings.storagePlace 'S3')}}
{{#if (eq settings.storagePlace 's3')}}
<div class="less padding field">
<label>
{{t 'Region'}}
Expand Down Expand Up @@ -89,4 +89,4 @@
</label>
{{input type='text' name='amazon_s3_secret' value=settings.awsSecret}}
</div>
{{/if}}
{{/if}}