You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2013/10/29 17:18:54 UTC
git commit: AMBARI-3613. Enable HA wizard loads after sign in
(alexantonenko)
Updated Branches:
refs/heads/trunk c7f1fed4b -> 6f104fb59
AMBARI-3613. Enable HA wizard loads after sign in (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6f104fb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6f104fb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6f104fb5
Branch: refs/heads/trunk
Commit: 6f104fb5929f21d01a25a02f13b0f12c3ad099ed
Parents: c7f1fed
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Oct 29 18:05:40 2013 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Oct 29 18:05:40 2013 +0200
----------------------------------------------------------------------
ambari-web/app/routes/high_availability_routes.js | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6f104fb5/ambari-web/app/routes/high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js
index bae310f..992c256 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -64,9 +64,17 @@ module.exports = Em.Route.extend({
App.router.transitionTo('rollbackHighAvailability');
}
}else {
- this.hide();
- App.router.get('highAvailabilityWizardController').setCurrentStep('1');
+ var controller = App.router.get('highAvailabilityWizardController');
+ controller.clearStorageData();
+ controller.setCurrentStep('1');
App.router.get('updateController').set('isWorking', true);
+ App.clusterStatus.setClusterStatus({
+ clusterName: App.router.get('content.cluster.name'),
+ clusterState: 'DEFAULT',
+ wizardControllerName: App.router.get('highAvailabilityWizardController.name'),
+ localdb: App.db.data
+ });
+ this.hide();
App.router.transitionTo('main.admin.adminHighAvailability');
}
@@ -301,7 +309,7 @@ module.exports = Em.Route.extend({
controller.get('popup').hide();
App.clusterStatus.setClusterStatus({
clusterName: controller.get('content.cluster.name'),
- clusterState: 'HIGH_AVAILABILITY_COMPLETED',
+ clusterState: 'DEFAULT',
wizardControllerName: 'highAvailabilityWizardController',
localdb: App.db.data
});