diff --git a/src/js/index.js b/src/js/index.js index 8e43603fe..ac4242566 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -347,10 +347,8 @@ app.filter('installationStateLabel', function () { }); app.filter('taskName', function () { - return function(app) { - if (!app) return ''; - - switch (app.installationState) { + return function(installationState) { + switch (installationState) { case ISTATES.PENDING_INSTALL: return 'install'; case ISTATES.PENDING_CLONE: return 'clone'; case ISTATES.PENDING_LOCATION_CHANGE: return 'location change'; @@ -365,7 +363,7 @@ app.filter('taskName', function () { case ISTATES.PENDING_BACKUP: return 'backup'; case ISTATES.PENDING_START: return 'start app'; case ISTATES.PENDING_STOP: return 'stop app'; - default: return app.installationState; + default: return installationState || ''; } }; }); diff --git a/src/views/app.html b/src/views/app.html index da4e4b0d8..73e2201c5 100644 --- a/src/views/app.html +++ b/src/views/app.html @@ -115,7 +115,7 @@

Cloudron will re-install the app in-place with existing configuration. Existing data will be retained.

-

The {{ app.error.task | taskName }} operation failed with the following error:

+

The {{ app.error.installationState | taskName }} operation failed with the following error:

{{ app.error.reason + ': ' + app.error.message }}

@@ -795,7 +795,7 @@

If the app is not starting up because of a broken plugin or misconfiguration, use the Terminal and click 'Pause' to edit the app's filesystem.

-

An error occurred during the {{ app.error.task | taskName }} operation: {{ app.error.reason + ': ' + app.error.message }}

+

An error occurred during the {{ app.error.installationState | taskName }} operation: {{ app.error.reason + ': ' + app.error.message }}