Author: yusaku
Date: Tue Jun 4 18:18:31 2013
New Revision: 1489541
URL: http://svn.apache.org/r1489541
Log:
AMBARI-2262. On "install Options" page, when selecting "Perform manual
registration on hosts and do not use SSH" is setting "Path to 64-bit JDK"
disabled. (Andrii Tkach via yusaku)
Modified:
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step2.hbs
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/wizard/step2_view.js
Modified:
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step2.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step2.hbs?rev=1489541&r1=1489540&r2=1489541&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step2.hbs
(original)
+++
incubator/ambari/branches/branch-1.2.4/ambari-web/app/templates/wizard/step2.hbs
Tue Jun 4 18:18:31 2013
@@ -76,7 +76,7 @@
{{t installer.step2.sshUser.account}}
</label>
<div {{bindAttr class="sshUserError:error :control-group"}}>
- {{view view.textFieldView
valueBinding="content.installOptions.sshUser"}}
+ {{view view.textFieldView
valueBinding="content.installOptions.sshUser"
isEnabledBinding="content.installOptions.useSsh"}}
{{#if sshUserError}}
<span class="help-inline">{{sshUserError}}</span>
{{/if}}
Modified:
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/wizard/step2_view.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/wizard/step2_view.js?rev=1489541&r1=1489540&r2=1489541&view=diff
==============================================================================
---
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/wizard/step2_view.js
(original)
+++
incubator/ambari/branches/branch-1.2.4/ambari-web/app/views/wizard/step2_view.js
Tue Jun 4 18:18:31 2013
@@ -111,8 +111,8 @@ App.WizardStep2View = Em.View.extend({
textFieldView: Ember.TextField.extend({
disabled: function(){
- return !this.get('controller.content.installOptions.useSsh');
- }.property('controller.content.installOptions.useSsh')
+ return !this.get('isEnabled');
+ }.property('isEnabled')
})
});
