svn commit: r1437773 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard.js ambari-web/app/routes/add_host_routes.js

[yusaku]

Author: yusaku
Date: Wed Jan 23 22:01:06 2013
New Revision: 1437773

URL: http://svn.apache.org/viewvc?rev=1437773&view=rev
Log:
AMBARI-1251. Fix routing issues on Add Host Wizard. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
    incubator/ambari/trunk/ambari-web/app/routes/add_host_routes.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1437773&r1=1437772&r2=1437773&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Jan 23 22:01:06 2013
@@ -116,6 +116,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-1251. Fix routing issues on Add Host Wizard. (yusaku)
+
  AMBARI-1230. There is a big gap in the lower part of the Jobs table header.
  (yusaku)
 

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard.js?rev=1437773&r1=1437772&r2=1437773&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard.js Wed Jan 23 
22:01:06 2013
@@ -42,7 +42,7 @@ App.WizardController = Em.Controller.ext
   },
 
   setStepsEnable: function () {
-    for (var i = 2; i <= this.totalSteps; i++) {
+    for (var i = 1; i <= this.totalSteps; i++) {
       var step = this.get('isStepDisabled').findProperty('step', i);
       if (i <= this.get('currentStep')) {
         step.set('value', false);

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=1437773&r1=1437772&r2=1437773&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 Wed Jan 23 
22:01:06 2013
@@ -67,9 +67,6 @@ module.exports = Em.Route.extend({
             addHostController.setCurrentStep('6');
             App.db.data = currentClusterStatus.localdb;
             break;
-          case 'ADD_HOSTS_COMPLETED_5' :
-            router.transitionTo('main.index');
-            break;
           default:
             break;
         }