Browse Source

AMBARI-2978. HDFS Summary: JournalNodes should not show if none is installed (total is 0). (Aleksandr Kovalenko via yusaku)

Yusaku Sako 11 years ago
parent
commit
c309d22722

+ 15 - 13
ambari-web/app/templates/main/dashboard/service/hdfs.hbs

@@ -58,19 +58,21 @@
         </td>
       </tr>
       <!-- Journal Nodes -->
-      <tr>
-        <td>{{t dashboard.services.hdfs.journalnodes}}</td>
-        <td>
-              <span>
-                {{#view view.journalNodesLiveTextView}}
-                  {{view.liveComponents}}/{{view.totalComponents}}
-                {{/view}}
-              </span>  {{t services.service.summary.JournalNodesLive}}
-          <div class="summary-view-host">
-            <a href="#" {{action filterHosts view.journalNodeComponent}}>{{view.journalNodeHostText}}</a>
-          </div>
-        </td>
-      </tr>
+      {{#if view.showJournalNodes}}
+        <tr>
+          <td>{{t dashboard.services.hdfs.journalnodes}}</td>
+          <td>
+                <span>
+                  {{#view view.journalNodesLiveTextView}}
+                    {{view.liveComponents}}/{{view.totalComponents}}
+                  {{/view}}
+                </span>  {{t services.service.summary.JournalNodesLive}}
+            <div class="summary-view-host">
+              <a href="#" {{action filterHosts view.journalNodeComponent}}>{{view.journalNodeHostText}}</a>
+            </div>
+          </td>
+        </tr>
+      {{/if}}
       <!-- NameNode Uptime -->
       <tr>
         <td>{{t dashboard.services.hdfs.nodes.uptime}}</td>

+ 5 - 1
ambari-web/app/views/main/dashboard/service/hdfs.js

@@ -61,6 +61,10 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     }
   }.property("service"),
 
+  showJournalNodes: function () {
+    return App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').get('length') > 0;
+  }.property('service.hostComponents.@each'),
+
   journalNodeHostText: function () {
     if(this.get("service.journalNodes").content.length > 1){
       return Em.I18n.t('services.service.summary.viewHosts');
@@ -165,7 +169,7 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
     return App.HostComponent.find().findProperty('componentName', 'DATANODE');
   }.property(),
 
-   journalNodeComponent: function () {
+  journalNodeComponent: function () {
     return App.HostComponent.find().findProperty('componentName', 'JOURNALNODE');
   }.property(),