ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject svn commit: r1489273 - in /incubator/ambari/trunk/ambari-web/app/utils: ajax.js string_utils.js
Date Tue, 04 Jun 2013 02:04:37 GMT
Author: jaimin
Date: Tue Jun  4 02:04:36 2013
New Revision: 1489273

URL: http://svn.apache.org/r1489273
Log:
AMBARI-2265: Install Wizard broken (Host Checks shows "success" but the result is empty, Customize
Services page does not render), etc.

Modified:
    incubator/ambari/trunk/ambari-web/app/utils/ajax.js
    incubator/ambari/trunk/ambari-web/app/utils/string_utils.js

Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1489273&r1=1489272&r2=1489273&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Tue Jun  4 02:04:36 2013
@@ -630,7 +630,7 @@ var urls = {
     }
   },
   'wizard.step3.host_info': {
-    'real': '/hosts?fields=Hosts/total_mem,Hosts/cpu_count,Hosts/disk_info,Hosts/last_agent_env',
+    'real': '/hosts?fields=Hosts/total_mem,Hosts/cpu_count,Hosts/disk_info,Hosts/last_agent_env,Hosts/host_name',
     'mock': '/data/wizard/bootstrap/two_hosts_information.json',
     'format': function (data, opt) {
       return {

Modified: incubator/ambari/trunk/ambari-web/app/utils/string_utils.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/string_utils.js?rev=1489273&r1=1489272&r2=1489273&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/string_utils.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/string_utils.js Tue Jun  4 02:04:36 2013
@@ -91,10 +91,12 @@ module.exports = {
       secondNumbers[i] = (secondNumbers[i] === undefined) ? 0 : window.parseInt(secondNumbers[i]);
       if(firstNumbers[i] > secondNumbers[i]){
         result = 1;
+        break;
       } else if(firstNumbers[i] === secondNumbers[i]){
         result = 0;
       } else if(firstNumbers[i] < secondNumbers[i]){
         result = -1;
+        break;
       }
       i++;
     }



Mime
View raw message