Repository: ambari Updated Branches: refs/heads/trunk 9c6f7490d -> f2b1a89ac
AMBARI-14489 EU/RU: failure not shown on all levels. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f2b1a89a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f2b1a89a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f2b1a89a Branch: refs/heads/trunk Commit: f2b1a89ac66946ea3b86bace27e78ac59a737a12 Parents: 9c6f749 Author: ababiichuk <ababiic...@hortonworks.com> Authored: Mon Dec 28 18:15:26 2015 +0200 Committer: ababiichuk <ababiic...@hortonworks.com> Committed: Mon Dec 28 18:15:35 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/models/upgrade_entity.js | 2 ++ .../app/templates/main/admin/stack_upgrade/upgrade_group.hbs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/f2b1a89a/ambari-web/app/models/upgrade_entity.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/upgrade_entity.js b/ambari-web/app/models/upgrade_entity.js index 89709b2..70d1840 100644 --- a/ambari-web/app/models/upgrade_entity.js +++ b/ambari-web/app/models/upgrade_entity.js @@ -78,6 +78,8 @@ App.upgradeEntity = Em.Object.extend({ return this.get('type') === 'GROUP' && (this.get('isActive') || this.get('hasExpandableItems')); }.property('isActive', 'hasExpandableItems'), + upgradeItemStatus: Em.computed.firstNotBlank('display_status', 'status'), + upgradeGroupStatus: function () { if (this.get('status') === 'ABORTED') { return 'SUSPENDED'; http://git-wip-us.apache.org/repos/asf/ambari/blob/f2b1a89a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs index ab0d70e..60cf553 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs @@ -44,7 +44,7 @@ {{#if item.isVisible}} <div class="row-fluid"> <div {{bindAttr class="item.isActive::not-active-link :span8 :upgrade-item-text"}}> - {{statusIcon item.status}} + {{statusIcon item.upgradeItemStatus}} <a href="#" {{action toggleExpanded item view.content.upgradeItems target="view"}}>{{item.context}}</a> </div> {{#if item.isRunning}} @@ -75,4 +75,4 @@ {{/if}} {{/each}} -</div> \ No newline at end of file +</div>
