ソースを参照

AMBARI-4625 Host Details > Components: action button label should show actual status when component is in Out-of-Service Mode. (ababiichuk)

aBabiichuk 11 年 前
コミット
16fe1f21df

+ 1 - 1
ambari-web/app/templates/main/host/details/host_component.hbs

@@ -24,7 +24,7 @@
       </a>
     {{/if}}
   {{else}}
-    <span rel='componentHealthTooltip' {{bindAttr class="view.statusClass :components-health" data-original-title="view.componentTextStatus"}}></span>&nbsp;
+    <span rel='componentHealthTooltip' {{bindAttr class="view.statusClass :components-health" data-original-title="view.componentStatusTooltip"}}></span>&nbsp;
   {{/if}}
   {{#if component.displayNameAdvanced}}
     {{component.displayNameAdvanced}}

+ 14 - 3
ambari-web/app/views/main/host/details/host_component_view.js

@@ -57,9 +57,6 @@ App.HostComponentView = Em.View.extend({
    * @type {String}
    */
   componentTextStatus: function () {
-    if (this.get('content.passiveState') != 'ACTIVE') {
-      return Em.I18n.t('hosts.component.passive.short.mode');
-    }
     var workStatus = this.get("workStatus");
     var componentTextStatus = this.get('content.componentTextStatus');
     var hostComponent = this.get('hostComponent');
@@ -98,6 +95,20 @@ App.HostComponentView = Em.View.extend({
   }.property('content.passiveState','workStatus','isDataNodeRecommissionAvailable', 'isDataNodeDecommissioning', 'isNodeManagerRecommissionAvailable', 'isNodeManagerDecommissioning',
       'isTaskTrackerRecommissionAvailable', 'isTaskTrackerDecommissioning', 'isRegionServerRecommissionAvailable', 'isRegionServerDecommissioning'),
 
+
+  /**
+   * Returns message for health tooltip
+   * in addition to workStatus it also displays passive state of component
+   * @type {String}
+   */
+  componentStatusTooltip: function() {
+    if (this.get('content.passiveState') != 'ACTIVE') {
+      return Em.I18n.t('hosts.component.passive.short.mode');
+    } else {
+      return this.get('componentTextStatus');
+    }
+  }.property('componentTextStatus','content.passiveState'),
+
   /**
    * @type {String}
    */