You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/12/28 19:25:32 UTC
ambari git commit: Revert "AMBARI-14489 EU/RU: failure not shown on
all levels. (ababiichuk)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 5e59325e4 -> fc5ac34d2
Revert "AMBARI-14489 EU/RU: failure not shown on all levels. (ababiichuk)"
This reverts commit 5e59325e4a30e872de82ea90279a558b2d8c9abf.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc5ac34d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc5ac34d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc5ac34d
Branch: refs/heads/branch-2.2
Commit: fc5ac34d24e2de7bc3f3224f25b86a6269630bec
Parents: 5e59325
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Mon Dec 28 10:25:11 2015 -0800
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Mon Dec 28 10:25:11 2015 -0800
----------------------------------------------------------------------
ambari-web/app/models/upgrade_entity.js | 2 --
.../app/templates/main/admin/stack_upgrade/upgrade_group.hbs | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fc5ac34d/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 85b5efd..3484d11 100644
--- a/ambari-web/app/models/upgrade_entity.js
+++ b/ambari-web/app/models/upgrade_entity.js
@@ -82,8 +82,6 @@ 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/fc5ac34d/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 60cf553..ab0d70e 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.upgradeItemStatus}}
+ {{statusIcon item.status}}
<a href="#" {{action toggleExpanded item view.content.upgradeItems target="view"}}>{{item.context}}</a>
</div>
{{#if item.isRunning}}
@@ -75,4 +75,4 @@
{{/if}}
{{/each}}
-</div>
+</div>
\ No newline at end of file