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

Only send backend specific fields on configuration

Browse Source
This commit is contained in:
Johannes Zellner
2017-04-21 16:52:10 +02:00
parent f7338c8210
commit cc8f8b2339
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -369,14 +369,19 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
var backupConfig = {
provider: $scope.configureBackup.provider,
bucket: $scope.configureBackup.bucket,
prefix: $scope.configureBackup.prefix,
accessKeyId: $scope.configureBackup.accessKeyId,
secretAccessKey: $scope.configureBackup.secretAccessKey,
key: $scope.configureBackup.key,
backupFolder: $scope.configureBackup.backupFolder
key: $scope.configureBackup.key
};
// only set provider specific fields, this will clear them in the db
if (backupConfig.provider === 's3') {
backupConfig.bucket = $scope.configureBackup.bucket;
backupConfig.prefix = $scope.configureBackup.prefix;
backupConfig.accessKeyId = $scope.configureBackup.accessKeyId;
backupConfig.secretAccessKey = $scope.configureBackup.secretAccessKey;
} else if (backupConfig.provider === 'filesystem') {
backupConfig.backupFolder = $scope.configureBackup.backupFolder;
}
if ($scope.configureBackup.region) backupConfig.region = $scope.configureBackup.region;
if ($scope.configureBackup.endpoint) backupConfig.endpoint = $scope.configureBackup.endpoint;
@@ -417,7 +422,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca
}
} else if (error.statusCode === 400) {
$scope.configureBackup.error.generic = error.message;
if ($scope.configureBackup.provider === 'filesystem') {
$scope.configureBackup.error.backupFolder = true;
}