AMBARI-2091. Custom JDK path not used when adding new hosts. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1480834 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -837,6 +837,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2091. Custom JDK path not used when adding new hosts. (yusaku)
+
  AMBARI-2089. Post Ambari upgrade, Hive and Oozie fail to start after
  reconfigure. (Xi Wang via yusaku)
 

ambari-web/app/controllers/wizard/step2_controller.js

@@ -26,6 +26,11 @@ App.WizardStep2Controller = Em.Controller.extend({
   bootRequestId:  null,
   hasSubmitted: false,
   inputtedAgainHostNames: [],
+
+  isInstaller: function () {
+    return this.get('content.controllerName') == 'installerController';
+  }.property('content.controllerName'),
+
   hostNames: function () {
     return this.get('content.installOptions.hostNames');
   }.property('content.installOptions.hostNames'),

ambari-web/app/templates/wizard/step2.hbs

@@ -95,7 +95,7 @@
         {{t installer.step2.localRepo.tooltip.title}}</a>
       {{t installer.step2.localRepo.label_instead}}
     </label>
-
+    {{#if isInstaller}}
     <label {{bindAttr class=":checkbox"}}>
       <div class="java-home">
       {{view Ember.Checkbox checkedBinding="content.installOptions.isJavaHome"}}
@@ -107,6 +107,7 @@
       </div>
       {{view App.WizardTextField valueBinding="content.installOptions.javaHome" placeholder="/usr/jdk/jdk1.6.0_31"}}
     </label>
+    {{/if}}
   </div>
   <div class="btn-area">
     {{#unless view.parentView.controller.hideBackButton}}