haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3512 from Pectojin/fix_gui_commandline_regression

Browse Source 
Fix commandline GUI regression
This commit is contained in:
Rune Henriksen
2018-11-26 13:27:38 +01:00
committed by GitHub
parent ec68a7c4b3 d345ff5632
commit 94cf55a231
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Duplicati/Server/webroot/ngax/scripts/controllers/CommandlineController.js
+6 -6
View File
@@ -35,7 +35,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
$scope.$watchCollection("ExtendedOptions", reloadOptionsList);
$scope.$watch("TargetURL", reloadOptionsList);
$scope.$on('systeminfochanged', reloadOptionsList);
reloadOptionsList();
var scope = $scope;
@@ -48,7 +48,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
var opts = AppUtils.parseOptionStrings($scope.ExtendedOptions || []);
var combined = angular.copy($scope.Arguments || []);
if (($scope.TargetURL || '').trim().length != 0)
combined.unshift($scope.TargetURL);
@@ -79,7 +79,7 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
$scope.Abort = function()
{
AppService.post('/commandline/' + viewid + '/abort' ).then(function(resp) {
}, function() {
AppUtils.connectionError.apply(AppUtils, arguments);
});
@@ -155,13 +155,13 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
}
if ($routeParams.backupid != null) {
AppService.get('/backup/' + $routeParams.backupid + '/export?argsonly=true').then(
AppService.get('/backup/' + $routeParams.backupid + '/export?argsonly=true&export-passwords=true').then(
function(resp) {
$scope.TargetURL = resp.data.Backend;
$scope.Arguments = resp.data.Arguments;
$scope.ExtendedOptions = resp.data.Options;
$scope.Command = 'backup';
},
},
function(resp) {
var message = resp.statusText;
if (resp.data != null && resp.data.Message != null)
@@ -171,4 +171,4 @@ backupApp.controller('CommandlineController', function($scope, $routeParams, $lo
}
);
}
});
});