diff --git a/src/views/backups.html b/src/views/backups.html index 345b44825..62c974e9b 100644 --- a/src/views/backups.html +++ b/src/views/backups.html @@ -150,7 +150,7 @@
- +
diff --git a/src/views/backups.js b/src/views/backups.js index 69c72cfb6..c2c7a169d 100644 --- a/src/views/backups.js +++ b/src/views/backups.js @@ -93,11 +93,11 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat { name: 'Wasabi', value: 'wasabi' } ]; - $scope.retentionTimes = [ - { name: '2 days', value: 2 * 24 * 60 * 60 }, - { name: '1 week', value: 7 * 24 * 60 * 60}, - { name: '1 month', value: 30 * 24 * 60 * 60}, - { name: 'Forever', value: -1 } + $scope.retentionPolicies = [ + { name: '2 days', value: { keepWithin: 2 * 24 * 60 * 60 }}, + { name: '1 week', value: { keepWithin: 7 * 24 * 60 * 60 }}, // default + { name: '1 month', value: { keepWithin: 30 * 24 * 60 * 60 }}, + { name: 'Forever', value: { keepWithin: -1 }} ]; $scope.intervalTimes = [ @@ -251,7 +251,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat region: '', endpoint: '', backupFolder: '', - retentionSecs: 7 * 24 * 60 * 60, + retentionPolicy: $scope.retentionPolicies[0], intervalSecs: 24 * 60 * 60, acceptSelfSignedCerts: false, useHardlinks: true, @@ -295,7 +295,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat $scope.configureBackup.endpoint = $scope.backupConfig.endpoint; $scope.configureBackup.password = $scope.backupConfig.password; $scope.configureBackup.backupFolder = $scope.backupConfig.backupFolder; - $scope.configureBackup.retentionSecs = $scope.backupConfig.retentionSecs; + $scope.configureBackup.retentionPolicy = $scope.backupConfig.retentionPolicy; $scope.configureBackup.intervalSecs = $scope.backupConfig.intervalSecs; $scope.configureBackup.format = $scope.backupConfig.format; $scope.configureBackup.acceptSelfSignedCerts = !!$scope.backupConfig.acceptSelfSignedCerts; @@ -311,7 +311,7 @@ angular.module('Application').controller('BackupsController', ['$scope', '$locat var backupConfig = { provider: $scope.configureBackup.provider, - retentionSecs: $scope.configureBackup.retentionSecs, + retentionPolicy: $scope.configureBackup.retentionPolicy, intervalSecs: $scope.configureBackup.intervalSecs, format: $scope.configureBackup.format };