incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1346641 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/js/selectServices.js
Date Tue, 05 Jun 2012 22:50:01 GMT
Author: vikram
Date: Tue Jun  5 22:50:01 2012
New Revision: 1346641

URL: http://svn.apache.org/viewvc?rev=1346641&view=rev
Log:
AMBARI-317. Select-all + unselect HBASE removes Zookeeper incorrectly  (Contributed by Vinod)

Modified:
    incubator/ambari/branches/ambari-186/CHANGES.txt
    incubator/ambari/branches/ambari-186/hmc/js/selectServices.js

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1346641&r1=1346640&r2=1346641&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Tue Jun  5 22:50:01 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-317. Select-all + unselect HBASE removes Zookeeper incorrectly (Vinod via Vikram)
+
   AMBARI-348. Select all services by default (Vinod via Vikram)
 
   AMBARI-247. Replace index.php with clusters.php (Varun via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/js/selectServices.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/selectServices.js?rev=1346641&r1=1346640&r2=1346641&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/selectServices.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/selectServices.js Tue Jun  5 22:50:01 2012
@@ -232,25 +232,16 @@ function selectDelectAll(selectAll) {
   var node = globalYui.one("#selectAllCheckBoxId");
   var labelNode = globalYui.one("#labelForSelectAllId");
   for (svcName in data['services']) {
-    if (!data['services'][svcName].attributes.noDisplay && !data['services'][svcName].attributes.mustInstall)
{
+    if (!data['services'][svcName].attributes.noDisplay && !data['services'][svcName].attributes.mustInstall
&& data['services'][svcName].attributes.editable) {
       var itemId = getButtonId(svcName);
-      globalYui.one('#' + itemId).set('checked' , selectAll);
-      // Forget about the history and set refCount explicitly
-      if (selectAll) {
-        data['services'][svcName]['refCount'] = 1;
-      } else {
-        data['services'][svcName]['refCount'] = 0;
-      }
-      if (!data['services'][svcName].attributes.editable) {
-         var nonEditableNode = globalYui.one('#selectServicesEntry' + svcName + 'DivId');
-         if (selectAll) {
-           nonEditableNode.setStyle('display', 'block');
-         } else {
-           nonEditableNode.setStyle('display', 'none');
-         }
+      if ( selectAll != globalYui.one('#' + itemId).get('checked')) {
+        globalYui.one('#' + itemId).set('checked' , selectAll);
+        setRefCounts(svcName);
       }
     }
   }
+  // All done, update our rendering
+  updateRendering();
 }
 
 globalYui.one('#selectServicesCoreDivId').delegate('click', function (e) {



Mime
View raw message