Forráskód Böngészése

AMBARI-14489 EU/RU: failure not shown on all levels. (ababiichuk)

ababiichuk 9 éve
szülő
commit
f2b1a89ac6

+ 2 - 0
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';

+ 2 - 2
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>
+</div>