svn commit: r1487198 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/service/item.js ambari-web/app/routes/reassign_master_routes.js

[yusaku]

Author: yusaku
Date: Wed May 29 02:02:34 2013
New Revision: 1487198

URL: http://svn.apache.org/r1487198
Log:
AMBARI-2208. Reassign Master Wizard: refreshing page on step 2, 3 or 4 breaks 
wizard. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
    incubator/ambari/trunk/ambari-web/app/routes/reassign_master_routes.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487198&r1=1487197&r2=1487198&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 02:02:34 2013
@@ -899,13 +899,16 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
- AMBARI-2205.  Reassign Master Wizard: Installing master with TIMEDOUT should
+ AMBARI-2208. Reassign Master Wizard: refreshing page on step 2, 3 or 4 breaks
+ wizard. (yusaku)
+
+ AMBARI-2205. Reassign Master Wizard: Installing master with TIMEDOUT should
  not be completed. (yusaku)
  
- AMBARI-2204.  Reassign Master Wizard: Review Config shouldn't show unchanged
+ AMBARI-2204. Reassign Master Wizard: Review Config shouldn't show unchanged
  values. (yusaku)
 
- AMBARI-2203.  Background operations popup does not automatically refresh the
+ AMBARI-2203. Background operations popup does not automatically refresh the
  task log. (yusaku)
 
  AMBARI-2202. Running the smoke test for a specific service should set the

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js?rev=1487198&r1=1487197&r2=1487198&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js 
(original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js Wed 
May 29 02:02:34 2013
@@ -193,7 +193,9 @@ App.MainServiceItemController = Em.Contr
    */
   reassignMaster: function (hostComponent) {
     console.log('In Reassign Master', hostComponent);
-    
App.router.get('reassignMasterController').saveComponentToReassign(hostComponent);
+    var reassignMasterController = App.router.get('reassignMasterController');
+    reassignMasterController.saveComponentToReassign(hostComponent);
+    reassignMasterController.setCurrentStep('1');
     App.router.transitionTo('reassignMaster');
   },
 

Modified: incubator/ambari/trunk/ambari-web/app/routes/reassign_master_routes.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/routes/reassign_master_routes.js?rev=1487198&r1=1487197&r2=1487198&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/routes/reassign_master_routes.js 
(original)
+++ incubator/ambari/trunk/ambari-web/app/routes/reassign_master_routes.js Wed 
May 29 02:02:34 2013
@@ -54,8 +54,6 @@ module.exports = Em.Route.extend({
         if (currentClusterStatus && currentClusterStatus.clusterState == 
'REASSIGN_MASTER_INSTALLING') {
           reassignMasterController.setCurrentStep('5');
           App.db.data = currentClusterStatus.localdb;
-        } else {
-          reassignMasterController.setCurrentStep('1');
         }
         router.transitionTo('step' + 
reassignMasterController.get('currentStep'));
       });