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/06/04 20:20:55 UTC

svn commit: r1489542 - in /incubator/ambari/trunk/ambari-web/app: templates/wizard/step2.hbs views/wizard/step2_view.js

Author: yusaku
Date: Tue Jun  4 18:20:52 2013
New Revision: 1489542

URL: http://svn.apache.org/r1489542
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/trunk/ambari-web/app/templates/wizard/step2.hbs
    incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js

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=1489542&r1=1489541&r2=1489542&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step2.hbs Tue Jun  4 18:20:52 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/trunk/ambari-web/app/views/wizard/step2_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js?rev=1489542&r1=1489541&r2=1489542&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/wizard/step2_view.js Tue Jun  4 18:20:52 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')
   })
 });