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

Fix restore code path to use remotePath

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-04-05 09:41:09 -07:00
parent 9c6b3a9825
commit 9540a0606c
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/client.js
+10 -10
View File
@@ -1225,9 +1225,9 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
});
};
Client.prototype.importBackup = function (appId, backupId, backupFormat, backupConfig, callback) {
Client.prototype.importBackup = function (appId, remotePath, backupFormat, backupConfig, callback) {
var data = {
backupId: backupId,
remotePath: remotePath,
backupFormat: backupFormat,
backupConfig: backupConfig,
};
@@ -3321,7 +3321,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
return 'Cloudron was setup';
case ACTION_RESTORE:
return 'Cloudron was restored using backup ' + data.backupId;
return 'Cloudron was restored using backup ' + data.remotePath;
case ACTION_APP_CONFIGURE: {
if (!data.app) return '';
@@ -3410,14 +3410,14 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
// older versions (<3.5) did not have these fields
if (data.fromManifest) details += ' from version ' + data.fromManifest.version;
if (data.toManifest) details += ' to version ' + data.toManifest.version;
if (data.backupId) details += ' using backup ' + data.backupId;
if (data.remotePath) details += ' using backup ' + data.remotePath;
return details;
case ACTION_APP_IMPORT:
if (!data.app) return '';
details = appName('', data.app, 'App') + 'was imported';
if (data.toManifest) details += ' to version ' + data.toManifest.version;
if (data.backupId) details += ' using backup ' + data.backupId;
if (data.remotePath) details += ' using backup ' + data.remotePath;
return details;
case ACTION_APP_UNINSTALL:
@@ -3441,16 +3441,16 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
if (data.errorMessage) {
return 'Backup ' + appName('of', data.app) + ' failed: ' + data.errorMessage;
} else {
return 'Backup ' + appName('of', data.app) + ' succeeded with backup id ' + data.backupId;
return 'Backup ' + appName('of', data.app) + ' succeeded with backup id ' + data.backupId + ' at ' + data.remotePath;
}
case ACTION_APP_CLONE:
if (appIdContext === data.oldAppId) {
return 'App was cloned to ' + data.newApp.fqdn + ' using backup ' + data.backupId;
return 'App was cloned to ' + data.newApp.fqdn + ' using backup ' + data.remotePath;
} else if (appIdContext === data.appId) {
return 'App was cloned from ' + data.oldApp.fqdn + ' using backup ' + data.backupId;
return 'App was cloned from ' + data.oldApp.fqdn + ' using backup ' + data.remotePath;
} else {
return appName('', data.newApp, 'App') + ' was cloned ' + appName('from', data.oldApp) + ' using backup ' + data.backupId;
return appName('', data.newApp, 'App') + ' was cloned ' + appName('from', data.oldApp) + ' using backup ' + data.remotePath;
}
case ACTION_APP_REPAIR:
@@ -3491,7 +3491,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
case ACTION_BACKUP_FINISH:
if (!errorMessage) {
return 'Cloudron backup created with Id ' + data.backupId;
return 'Cloudron backup created at ' + data.remotePath;
} else {
return 'Cloudron backup errored with error: ' + errorMessage;
}