Repository: ambari Updated Branches: refs/heads/branch-2.0.0 c556bb7b9 -> fd2abedb0
AMBARI-9774. Start and Test services at enable security shows 100% even though its not completed (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd2abedb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd2abedb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd2abedb Branch: refs/heads/branch-2.0.0 Commit: fd2abedb082fc1e5591f5a44fdf13963ce41653e Parents: c556bb7 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Tue Feb 24 19:55:26 2015 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Tue Feb 24 19:55:26 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/mixins/wizard/wizardProgressPageController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fd2abedb/ambari-web/app/mixins/wizard/wizardProgressPageController.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/wizard/wizardProgressPageController.js b/ambari-web/app/mixins/wizard/wizardProgressPageController.js index e273ca4..6b7d9f0 100644 --- a/ambari-web/app/mixins/wizard/wizardProgressPageController.js +++ b/ambari-web/app/mixins/wizard/wizardProgressPageController.js @@ -203,7 +203,7 @@ App.wizardProgressPageControllerMixin = Em.Mixin.create({ + tasksInCurrentStage.filterProperty('Tasks.status', 'TIMEDOUT').length; var queuedActions = tasksInCurrentStage.filterProperty('Tasks.status', 'QUEUED').length; var inProgressActions = tasksInCurrentStage.filterProperty('Tasks.status', 'IN_PROGRESS').length; - var progress = Math.ceil(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / tasksInCurrentStage.length * 100); + var progress = completedActions == this.get('tasks.length') ? 100 : Math.floor(((queuedActions * 0.09) + (inProgressActions * 0.35) + completedActions ) / tasksInCurrentStage.length * 100); this.get('tasks').findProperty('id', currentTaskId).set('progress', progress); }
