restore: setupToken must be set on the top level object
This commit is contained in:
+3
-2
@@ -1187,13 +1187,14 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
|
||||
});
|
||||
};
|
||||
|
||||
Client.prototype.restore = function (backupConfig, backupId, version, sysinfoConfig, skipDnsSetup, callback) {
|
||||
Client.prototype.restore = function (backupConfig, backupId, version, sysinfoConfig, skipDnsSetup, setupToken, callback) {
|
||||
var data = {
|
||||
backupConfig: backupConfig,
|
||||
backupId: backupId,
|
||||
version: version,
|
||||
sysinfoConfig: sysinfoConfig,
|
||||
skipDnsSetup: skipDnsSetup
|
||||
skipDnsSetup: skipDnsSetup,
|
||||
setupToken: setupToken
|
||||
};
|
||||
|
||||
post('/api/v1/cloudron/restore', data, null, function (error, data, status) {
|
||||
|
||||
+1
-2
@@ -198,7 +198,6 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
|
||||
var backupConfig = {
|
||||
provider: $scope.provider,
|
||||
format: $scope.format,
|
||||
setupToken: $scope.setupToken
|
||||
};
|
||||
if ($scope.password) backupConfig.password = $scope.password;
|
||||
|
||||
@@ -323,7 +322,7 @@ app.controller('RestoreController', ['$scope', 'Client', function ($scope, Clien
|
||||
sysinfoConfig.ifname = $scope.sysinfo.ifname;
|
||||
}
|
||||
|
||||
Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, $scope.skipDnsSetup, function (error) {
|
||||
Client.restore(backupConfig, $scope.backupId.replace(/\.tar\.gz(\.enc)?$/, ''), version ? version[1] : '', sysinfoConfig, $scope.skipDnsSetup, $scope.setupToken, function (error) {
|
||||
$scope.busy = false;
|
||||
|
||||
if (error) {
|
||||
|
||||
Reference in New Issue
Block a user