浏览代码

AMBARI-3059 Frontend changes for "JDK options both during ambari-server setup and installer UI is confusing". (Andrii Babiichuk via atkach)

atkach 12 年之前
父节点
当前提交
f0c0cd24ea

+ 0 - 1
ambari-web/app/controllers/wizard.js

@@ -438,7 +438,6 @@ App.WizardController = Em.Controller.extend({
     hostNames: "", //string
     manualInstall: false, //true, false
     useSsh: true, //bool
-    isJavaHome : false, //bool
     javaHome: App.defaultJavaHome, //string
     localRepo: false, //true, false
     sshKey: "", //string

+ 19 - 0
ambari-web/app/controllers/wizard/step2_controller.js

@@ -333,8 +333,27 @@ App.WizardStep2Controller = Em.Controller.extend({
     return (this.get('hostsError') || this.get('sshKeyError') || this.get('sshUserError'))  ;
   }.property('hostsError', 'sshKeyError', 'sshUserError'),
 
+  setAmbariJavaHome: function(){
+    App.ajax.send({
+      name: 'ambari.service',
+      sender: this,
+      success: 'onGetAmbariJavaHomeSuccess',
+      error: 'onGetAmbariJavaHomeError'
+    });
+  },
+
+  onGetAmbariJavaHomeSuccess: function(data) {
+    this.set('content.installOptions.javaHome',data.RootServiceComponents.properties['java.home']);
+  },
+
+  onGetAmbariJavaHomeError: function() {
+    console.warn('can\'t get java.home value from server');
+    this.set('content.installOptions.javaHome',App.defaultJavaHome);
+  },
+
   saveHosts: function(){
     this.set('content.hosts', this.getHostInfo());
+    this.setAmbariJavaHome();
     App.router.send('next');
   }
 

+ 1 - 16
ambari-web/app/templates/wizard/step2.hbs

@@ -114,21 +114,6 @@
     </label>
     {{/unless}}
     
-    {{#if isInstaller}}
-    <label {{bindAttr class=":checkbox"}}>
-      <div class="java-home">
-      {{view Ember.Checkbox checkedBinding="content.installOptions.isJavaHome"}}
-        {{t installer.step2.javaHome.label}}
-        <a href="javascript:void(null)"
-           rel="popover"
-          {{translateAttr title="installer.step2.javaHome.tooltip.title" data-content="installer.step2.javaHome.tooltip.content"}}>
-            {{t installer.step2.javaHome.tooltip.title}}</a>
-      </div>
-    </label>
-    <label class="checkbox">
-      {{view view.textFieldView valueBinding="content.installOptions.javaHome" isEnabledBinding="content.installOptions.isJavaHome" placeholderName="installer.step2.javaHome.tooltip.placeholder"}}
-    </label>
-    {{/if}}
   </div>
   <div class="btn-area">
     {{#unless view.parentView.controller.hideBackButton}}
@@ -138,4 +123,4 @@
       {{t installer.step2.registerAndConfirm}} &rarr;</a>
   </div>
 
-</div>
+</div>

+ 4 - 0
ambari-web/app/utils/ajax.js

@@ -998,6 +998,10 @@ var urls = {
         async: false
       };
     }
+  },
+  'ambari.service': {
+    'real': '/services/AMBARI/components/AMBARI_SERVER',
+    'mock': ''
   }
 };
 /**