Updated Branches: refs/heads/trunk 58ce96dc5 -> b7f6163a5
AMBARI-4408. Background operations dialog in weird state after exception. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7f6163a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7f6163a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7f6163a Branch: refs/heads/trunk Commit: b7f6163a5cf728fb8ed4c750fc10fef799597d7c Parents: 58ce96d Author: Srimanth Gunturi <[email protected]> Authored: Thu Jan 23 18:46:05 2014 -0800 Committer: Srimanth Gunturi <[email protected]> Committed: Thu Jan 23 18:47:05 2014 -0800 ---------------------------------------------------------------------- ambari-web/app/templates/common/host_progress_popup.hbs | 2 -- ambari-web/app/utils/host_progress_popup.js | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f6163a/ambari-web/app/templates/common/host_progress_popup.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs index 3827820..c3a64d8 100644 --- a/ambari-web/app/templates/common/host_progress_popup.hbs +++ b/ambari-web/app/templates/common/host_progress_popup.hbs @@ -98,8 +98,6 @@ </div> {{/if}} {{/if}} - </div> - </div> <div id="host-info"> {{#if view.isHostEmptyList}} <div class="log-list-wrap">{{t hostPopup.noHostsToShow}}</div> http://git-wip-us.apache.org/repos/asf/ambari/blob/b7f6163a/ambari-web/app/utils/host_progress_popup.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js index fe921eb..503e621 100644 --- a/ambari-web/app/utils/host_progress_popup.js +++ b/ambari-web/app/utils/host_progress_popup.js @@ -744,7 +744,8 @@ App.HostPopup = Em.Object.create({ var self = this; var id = this.get('sourceRequestScheduleId'); batchUtils.getRequestSchedule(id, function(data) { - if (data != null && data.RequestSchedule.status != null) { + if (data != null && data.RequestSchedule != null && + data.RequestSchedule.status != null) { switch (data.RequestSchedule.status) { case 'DISABLED': self.set('sourceRequestScheduleRunning', false);
