Browse Source

AMBARI-257. Manage services section will have any empty section when no client only components installed

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/ambari-186@1339766 13f79535-47bb-0310-9956-ffa450edef68
Ramya Sunil 13 năm trước cách đây
mục cha
commit
7daa0b2ac7
2 tập tin đã thay đổi với 10 bổ sung3 xóa
  1. 3 0
      CHANGES.txt
  2. 7 3
      hmc/js/manageServices.js

+ 3 - 0
CHANGES.txt

@@ -2,6 +2,9 @@ Ambari Change log
 
 Release 0.x.x - unreleased
 
+  AMBARI-257. Manage services section will have any empty section when no 
+  client only components installed (Vinod via ramya)
+
   AMBARI-253. Support uninstall state in mysql modules (ramya)
 
   AMBARI-258. Start/Stop service show services that are not dependent on the 

+ 7 - 3
hmc/js/manageServices.js

@@ -479,14 +479,18 @@ var fetchClusterServicesPollerResponseHandler = {
     var serviceManagementMarkup = '';
 
     // Separate block for client-only software
-    serviceManagementMarkup += '<div class="serviceManagementGroup"> Client-only software: <br/>';
+    var clientOnlySoftwareMarkup = '';
     for (var serviceName in clusterServices) {
       var serviceInfo = clusterServices[serviceName];
       if (clusterServices.hasOwnProperty(serviceName) && !serviceInfo.attributes.runnable) {
-        serviceManagementMarkup += generateServiceManagementEntryMarkup( serviceName, serviceInfo );
+        clientOnlySoftwareMarkup += generateServiceManagementEntryMarkup( serviceName, serviceInfo );
       }
     }
-    serviceManagementMarkup += '</div>';
+    if (clientOnlySoftwareMarkup != '') {
+      serviceManagementMarkup += '<div class="serviceManagementGroup"> Client-only software: <br/>';
+      serviceManagementGroup += clientOnlySoftwareMarkup;
+      serviceManagementMarkup += '</div>';
+    }
 
     // Real services with server side components
     serviceManagementMarkup += '<div class="serviceManagementGroup"> Long running services: <br/><ul>';