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/04/18 06:42:28 UTC
svn commit: r1469154 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step3_controller.js ambari-web/app/routes/add_host_routes.js ambari-web/app/routes/installer.js ambari-web/app/templates/wizard/step3.hbs

Author: yusaku
Date: Thu Apr 18 04:42:28 2013
New Revision: 1469154

URL: http://svn.apache.org/r1469154
Log:
AMBARI-1960. Back button can be pressed while host registration is taking process, even though the button seems disabled. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
    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=1469154&r1=1469153&r2=1469154&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Thu Apr 18 04:42:28 2013
@@ -749,6 +749,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1960. "Back" button can be pressed while host registration is taking
+ process, even though the button seems disabled. (yusaku)
+
  AMBARI-1959. Cannot login to Ambari after login failure. (yusaku)
 
  AMBARI-1957. Hosts table: whether the alert filter is in effect or not is

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1469154&r1=1469153&r2=1469154&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Thu Apr 18 04:42:28 2013
@@ -948,6 +948,13 @@ App.WizardStep3Controller = Em.Controlle
     if (this.parseHostInfo(mockHosts, selectedHosts)) {
       // this.saveHostInfoToDb();
     }
+  },
+
+  back: function () {
+    if (this.get('isInstallInProgress')) {
+      return false;
+    }
+    App.router.send('back');
   }
 
 });

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=1469154&r1=1469153&r2=1469154&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 Thu Apr 18 04:42:28 2013
@@ -128,11 +128,8 @@ module.exports = Em.Route.extend({
         controller.connectOutlet('wizardStep3', controller.get('content'));
       })
     },
-    back: function(router, event){
-      //if install not in progress
-      if(!event.contexts[0].get("isInstallInProgress")){
-        router.transitionTo('step1');
-      }
+    back: function(router){
+      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=1469154&r1=1469153&r2=1469154&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/installer.js (original)
+++ incubator/ambari/trunk/ambari-web/app/routes/installer.js Thu Apr 18 04:42:28 2013
@@ -149,11 +149,8 @@ module.exports = Em.Route.extend({
       controller.loadAllPriorSteps();
       controller.connectOutlet('wizardStep3', controller.get('content'));
     },
-    back: function(router, event){
-      //if install not in progress
-      if(!$(event.target).attr('disabled')){
+    back: function(router){
         router.transitionTo('step2');
-      }
     },
     next: function (router, context) {
       var installerController = router.get('installerController');

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=1469154&r1=1469153&r2=1469154&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs Thu Apr 18 04:42:28 2013
@@ -138,7 +138,7 @@
       {{/if}}
     {{/if}}
   <div class="btn-area">
-    <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} {{action back controller}}>&larr; {{t common.back}}</a>
+    <a class="btn pull-left" {{bindAttr disabled="isInstallInProgress"}} {{action back target="controller"}}>&larr; {{t common.back}}</a>
     <a class="btn btn-success pull-right" {{bindAttr disabled="isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.next}} &rarr;</a>
   </div>
 </div>
\ No newline at end of file