diff --git a/src/js/client.js b/src/js/client.js index 5ada4d57d..8adb576bf 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -1793,6 +1793,11 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout if (task) { app.progress = task.percent; app.message = task.message; + app.taskMinutesActive = moment.duration(moment.utc().diff(moment.utc(task.creationTime))).asMinutes(); + } else { + app.progress = 0; + app.message = ''; + app.taskMinutesActive = 0; } that._updateAppCache(app); diff --git a/src/views/app.html b/src/views/app.html index a7a13fe26..05379415c 100644 --- a/src/views/app.html +++ b/src/views/app.html @@ -429,7 +429,7 @@

{{ app.label || app.fqdn }}
- {{ app | installationStateLabel }} {{ app.taskProgressMessage ? ' - ' + app.taskProgressMessage : '' }} + {{ app | installationStateLabel }} {{ app.message ? ' - ' + app.message : '' }} : {{ app.error.reason + ' - ' + app.error.message }}

@@ -453,7 +453,7 @@
-
+
diff --git a/src/views/app.js b/src/views/app.js index 3b8f07320..8ba1c2537 100644 --- a/src/views/app.js +++ b/src/views/app.js @@ -1469,16 +1469,10 @@ angular.module('Application').controller('AppController', ['$scope', '$location' function refreshApp(appId, callback) { callback = callback || function () {}; - Client.getApp(appId, function (error, app) { + Client.refreshAppCache(appId, function (error, app) { if (error && error.statusCode === 404) return $location.path('/apps'); if (error) return callback(error); - // ensure we have amended progress properties set before copy - if ($scope.app) { - app.taskProgress = $scope.app.taskProgress; - app.taskProgressMessage = $scope.app.taskProgressMessage; - } - $scope.app = app; // show 'Start App' if app is starting or is stopped @@ -1488,23 +1482,7 @@ angular.module('Application').controller('AppController', ['$scope', '$location' $scope.console.startButton = app.runState === RSTATES.STOPPED; } - if (app.taskId) { - Client.getTask(app.taskId, function (error, task) { - if (error) return callback(error); - - $scope.app.taskProgress = task && task.percent ? task.percent : 5; // start with 5 to avoid empty progress bar - $scope.app.taskProgressMessage = task ? task.message : ''; - $scope.app.taskMinutesActive = task ? moment.duration(moment.utc().diff(moment.utc(task.creationTime))).asMinutes() : 0; - - callback(); - }); - } else { - $scope.app.taskProgress = 0; - $scope.app.taskProgressMessage = ''; - $scope.app.taskMinutesActive = 0; - - callback(); - } + callback(); }); }