瀏覽代碼

AMBARI-2265: Install Wizard broken (Host Checks shows "success" but the result is empty, Customize Services page does not render), etc.

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1489273 13f79535-47bb-0310-9956-ffa450edef68
Jaimin Jetly 12 年之前
父節點
當前提交
f5036a26e8
共有 2 個文件被更改,包括 3 次插入1 次删除
  1. 1 1
      ambari-web/app/utils/ajax.js
  2. 2 0
      ambari-web/app/utils/string_utils.js

+ 1 - 1
ambari-web/app/utils/ajax.js

@@ -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 {

+ 2 - 0
ambari-web/app/utils/string_utils.js

@@ -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++;
     }