eventlog: use appName

This commit is contained in:
Girish Ramakrishnan
2021-09-30 11:48:13 -07:00
parent ede4da931c
commit b27d439834
+10 -10
View File
@@ -3198,11 +3198,11 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
case ACTION_APP_INSTALL:
if (!data.app) return '';
return data.app.manifest.title + ' (package v' + data.app.manifest.version + ') was installed at ' + (data.app.fqdn || data.app.location);
return data.app.manifest.title + ' (package v' + data.app.manifest.version + ') was installed at ' + appName(data.app);
case ACTION_APP_RESTORE:
if (!data.app) return '';
details = data.app.manifest.title + ' was restored at ' + (data.app.fqdn || data.app.location);
details = appName(data.app) + ' was restored';
// 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;
@@ -3211,37 +3211,37 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
case ACTION_APP_IMPORT:
if (!data.app) return '';
details = data.app.manifest.title + ' was imported at ' + (data.app.fqdn || data.app.location);
details = appName(data.app) + ' was imported';
if (data.toManifest) details += ' to version ' + data.toManifest.version;
if (data.backupId) details += ' using backup ' + data.backupId;
return details;
case ACTION_APP_UNINSTALL:
if (!data.app) return '';
return data.app.manifest.title + ' (package v' + data.app.manifest.version + ') was uninstalled at ' + (data.app.fqdn || data.app.location);
return appName(data.app) + ' (package v' + data.app.manifest.version + ') was uninstalled';
case ACTION_APP_UPDATE:
if (!data.app) return '';
return 'Update of ' + data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' started from v' + data.fromManifest.version + ' to v' + data.toManifest.version;
return 'Update of ' + appName(data.app) + ' started from v' + data.fromManifest.version + ' to v' + data.toManifest.version;
case ACTION_APP_UPDATE_FINISH:
if (!data.app) return '';
return data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' was updated to v' + data.app.manifest.version;
return appName(data.app) + ' was updated to v' + data.app.manifest.version;
case ACTION_APP_BACKUP:
if (!data.app) return '';
return 'Backup of ' + data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' started';
return 'Backup of ' + appName(data.app) + ' started';
case ACTION_APP_BACKUP_FINISH:
if (!data.app) return '';
if (data.errorMessage) {
return 'Backup of ' + data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' failed: ' + data.errorMessage;
return 'Backup of ' + appName(data.app) + ' failed: ' + data.errorMessage;
} else {
return 'Backup of ' + data.app.manifest.title + ' at ' + (data.app.fqdn || data.app.location) + ' succeeded with backup id ' + data.backupId;
return 'Backup of ' + appName(data.app) + ' succeeded with backup id ' + data.backupId;
}
case ACTION_APP_CLONE:
return data.newApp.manifest.title + ' at ' + (data.newApp.fqdn || data.newApp.location) + ' was cloned from ' + (data.oldApp.fqdn || data.oldApp.location) + ' using backup ' + data.backupId + ' with v' + data.oldApp.manifest.version;
return appName(data.newApp) + ' was cloned from ' + appName(data.oldApp) + ' using backup ' + data.backupId + ' with v' + data.oldApp.manifest.version;
case ACTION_APP_REPAIR:
return 'App ' + appName(data.app) + ' was re-configured'; // re-configure of email apps is more common?