Author: yusaku
Date: Fri May 17 00:32:04 2013
New Revision: 1483623
URL: http://svn.apache.org/r1483623
Log:
AMBARI-2155. Incorrect page display after closing Reassign Master Wizard.
(yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
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=1483623&r1=1483622&r2=1483623&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 17 00:32:04 2013
@@ -862,6 +862,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2155. Incorrect page display after closing Reassign Master Wizard.
+ (yusaku)
+
AMBARI-2154. Unwanted auto scrolling on the Host detail page. (yusaku)
AMBARI-2153. Reassign Master Wizard: Background Operations popup should show
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=1483623&r1=1483622&r2=1483623&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 Fri
May 17 00:32:04 2013
@@ -37,12 +37,12 @@ module.exports = Em.Route.extend({
onPrimary:function () {
this.hide();
App.router.get('updateController').set('isWorking', true);
- App.router.transitionTo('main.services');
+ App.router.transitionTo('main.services.index');
},
onClose: function() {
this.hide();
App.router.get('updateController').set('isWorking', true);
- App.router.transitionTo('main.services')
+ App.router.transitionTo('main.services.index')
},
didInsertElement: function(){
this.fitHeight();
