incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vik...@apache.org
Subject svn commit: r1347307 - in /incubator/ambari/branches/ambari-186: CHANGES.txt hmc/js/configureServicesUtils.js
Date Thu, 07 Jun 2012 02:20:44 GMT
Author: vikram
Date: Thu Jun  7 02:20:44 2012
New Revision: 1347307

URL: http://svn.apache.org/viewvc?rev=1347307&view=rev
Log:
AMBARI-484. Reconfigure option for Nagios service does not work (Contributed by Vikram)

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

Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1347307&r1=1347306&r2=1347307&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Thu Jun  7 02:20:44 2012
@@ -6,6 +6,8 @@ characters wide.
 
 Release 0.1.x - unreleased
 
+  AMBARI-484. Reconfigure option for Nagios service does not work (Vikram)
+
   AMBARI-483. Start Making Responses From fileCombinator.php Suitably Cacheable (Varun via
Vikram)
 
   AMBARI-482. Show the same welcome page to the user if the user starts configuring a cluster
but has not started deploy yet (Yusaku via Vikram)

Modified: incubator/ambari/branches/ambari-186/hmc/js/configureServicesUtils.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/js/configureServicesUtils.js?rev=1347307&r1=1347306&r2=1347307&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/js/configureServicesUtils.js (original)
+++ incubator/ambari/branches/ambari-186/hmc/js/configureServicesUtils.js Thu Jun  7 02:20:44
2012
@@ -138,7 +138,7 @@ function checkPasswordCorrectness () {
     divId = "#" + globalPasswordsArray[count]['verificationDivId'];
     var verifyPasswd = globalYui.one(divId).get('value');
 
-    if (passwd !== verifyPasswd) {
+    if (passwd != verifyPasswd) {
       errCount++;
       errString += "<li>Password does not match for " + globalYui.one(divId).get('name')
+ "</li>";
       globalYui.one(divId).addClass('formInputError');
@@ -168,7 +168,7 @@ function checkPasswordCorrectness () {
 function generateUserOpts () {
 
   var retval = checkPasswordCorrectness();
-  if (retval.passwdMatched !== true) {
+  if (retval.passwdMatched != true) {
     setFormStatus(retval.errorString, true, true);
     document.getElementById(retval.focusOn).scrollIntoView();
     return {};
@@ -184,6 +184,12 @@ function generateUserOpts () {
     var prop = globalYui.all(selectionStr);
     var properties = {};
     prop.each(function (proper) {
+      for (i = 0; i < globalPasswordsArray.length; i++) {
+        if (proper.get('id') == globalPasswordsArray[i]['verificationDivId']) {
+          return;
+        }
+      }
+
       var value = globalYui.Lang.trim(proper.get('value'));
       if ((proper.get('type') == "checkbox")) {
         value = proper.get('checked').toString();



Mime
View raw message