You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/10 01:04:04 UTC
svn commit: r1480834 - in /incubator/ambari/trunk: CHANGES.txt
ambari-web/app/controllers/wizard/step2_controller.js
ambari-web/app/templates/wizard/step2.hbs
Author: yusaku
Date: Thu May 9 23:04:01 2013
New Revision: 1480834
URL: http://svn.apache.org/r1480834
Log:
AMBARI-2091. Custom JDK path not used when adding new hosts. (yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js
incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1480834&r1=1480833&r2=1480834&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu May 9 23:04:01 2013
@@ -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)
Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js?rev=1480834&r1=1480833&r2=1480834&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step2_controller.js Thu May 9 23:04:01 2013
@@ -26,6 +26,11 @@ App.WizardStep2Controller = Em.Controlle
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'),
Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs?rev=1480834&r1=1480833&r2=1480834&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs Thu May 9 23:04:01 2013
@@ -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}}