Updated Branches: refs/heads/trunk ed800deb2 -> 951fc09e7
AMBARI-2936. NameNode HA Wizard: E2E integration for progress page after "Initialize Metadata". (Antonenko Alexander via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/951fc09e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/951fc09e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/951fc09e Branch: refs/heads/trunk Commit: 951fc09e7a559e0c6ff57ecd46144e228742ffd9 Parents: ed800de Author: Yusaku Sako <[email protected]> Authored: Mon Aug 19 12:05:33 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Mon Aug 19 12:05:33 2013 -0700 ---------------------------------------------------------------------- .../main/admin/highAvailability/progress_controller.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/951fc09e/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js index 1bd8ede..994ee1e 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -86,12 +86,14 @@ App.HighAvailabilityProgressPageController = Em.Controller.extend({ setTaskLogs: function (taskId, tasks) { var hosts = []; - tasks.forEach(function (task) { + var uniqHosts = tasks.mapProperty('Tasks.host_name').uniq(); + uniqHosts.forEach(function (host) { + var curHostTasks = tasks.filterProperty('Tasks.host_name', host); hosts.push( { - name: task.Tasks.host_name, - publicName: task.Tasks.host_name, - logTasks: [task] + name: host, + publicName: host, + logTasks: curHostTasks } ); });
