svn commit: r1437199 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/routes/add_host_routes.js ambari-web/app/routes/installer.js ambari-web/app/templates/wizard/step3.hbs

[yusaku]

Author: yusaku
Date: Tue Jan 22 21:50:01 2013
New Revision: 1437199

URL: http://svn.apache.org/viewvc?rev=1437199&view=rev
Log:
AMBARI-1245. Do not let the user go back to the previous step while host 
bootstrap is in progress. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
    incubator/ambari/trunk/ambari-web/app/routes/installer.js
    incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1437199&r1=1437198&r2=1437199&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue Jan 22 21:50:01 2013
@@ -17,6 +17,9 @@ Trunk (unreleased changes):
 
  IMPROVEMENTS
 
+ AMBARI-1245. Do not let the user go back to the previous step while host
+ bootstrap is in progress. (yusaku)
+
  AMBARI-1244. Install Options - line up the Target Hosts section with the rest
  of the page. (yusaku)
 

Modified: incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js?rev=1437199&r1=1437198&r2=1437199&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js Tue Jan 22 
21:50:01 2013
@@ -131,7 +131,12 @@ module.exports = Em.Route.extend({
         controller.connectOutlet('wizardStep3', controller.get('content'));
       })
     },
-    back: Em.Router.transitionTo('step1'),
+    back: function(router, event){
+      //if install not in progress
+      if(!$(event.target).attr('disabled')){
+        router.transitionTo('step1');
+      }
+    },
     exit: function (router) {
       router.get('wizardStep3Controller').set('stopBootstrap', true);
     },

Modified: incubator/ambari/trunk/ambari-web/app/routes/installer.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/installer.js?rev=1437199&r1=1437198&r2=1437199&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Tue Jan 22 
21:50:01 2013
@@ -149,10 +149,10 @@ module.exports = Em.Route.extend({
       controller.loadAllPriorSteps();
       controller.connectOutlet('wizardStep3', controller.get('content'));
     },
-    back: function(event){
+    back: function(router, event){
       //if install not in progress
-      if(!event.context){
-        Em.Router.transitionTo('step2');
+      if(!$(event.target).attr('disabled')){
+        router.transitionTo('step2');
       }
     },
     next: function (router, context) {

Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs?rev=1437199&r1=1437198&r2=1437199&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs Tue Jan 22 
21:50:01 2013
@@ -125,7 +125,7 @@
     </div>
   </div>
   <div class="btn-area">
-    <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} 
{{action back isInstallInProgress}}>&larr; Back</a>
+    <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} 
{{action back}}>&larr; Back</a>
     <a class="btn btn-success pull-right" {{bindAttr 
disabled="isSubmitDisabled"}} {{action submit target="controller"}}>Next 
&rarr;</a>
   </div>
 </div>
\ No newline at end of file