jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Give correct feedback if S3 region is wrong

Browse Source 
Fixes #87
This commit is contained in:
Johannes
2016-10-28 16:47:46 +02:00
parent 5ba86d5c35
commit 9f973133e8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webadmin/src/views/settings.html
View File

@@ -134,9 +134,9 @@
<input type="text" class="form-control" ng-model="configureBackup.prefix" id="inputConfigureBackupPrefix" name="prefix" ng-disabled="configureBackup.busy" required>
</div>
<div class="form-group">
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.region }">
<label class="control-label" for="inputConfigureBackupRegion">S3 Region</label>
<select class="form-control" id="inputConfigureBackupRegion" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" required></select>
<select class="form-control" name="region" id="inputConfigureBackupRegion" ng-model="configureBackup.region" ng-options="a.value as a.name for a in s3Regions" ng-disabled="configureBackup.busy" required></select>
</div>
<div class="form-group" ng-class="{ 'has-error': configureBackup.error.accessKeyId }">

6
webadmin/src/views/settings.js
View File

@@ -328,7 +328,11 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
} else if (error.message.indexOf('ECONNREFUSED') !== -1) {
$scope.configureBackup.error.generic = 'Unknown region';
$scope.configureBackup.error.region = true;
$scope.configureBackup.region = '';
$scope.configureBackupForm.region.$setPristine();
$('#inputConfigureBackupRegion').focus();
} else if (error.message.toLowerCase() === 'wrong region') {
$scope.configureBackup.error.generic = 'Wrong S3 Region';
$scope.configureBackup.error.region = true;
$scope.configureBackupForm.region.$setPristine();
$('#inputConfigureBackupRegion').focus();
} else {