Updated Branches: refs/heads/trunk d6aca0b4d -> 94fd897f6
AMBARI-3539. NameNode HA wizard: Refreshing on review page navigates to select host page (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/94fd897f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/94fd897f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/94fd897f Branch: refs/heads/trunk Commit: 94fd897f67298a2c8b9acca9ef454e08bcccb292 Parents: d6aca0b Author: Alex Antonenko <[email protected]> Authored: Thu Oct 17 19:33:25 2013 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Oct 17 19:33:25 2013 +0300 ---------------------------------------------------------------------- .../main/admin/highAvailability/wizard_controller.js | 10 ++++++++++ ambari-web/app/routes/high_availability_routes.js | 12 ------------ ambari-web/app/routes/rollbackHA_routes.js | 1 - 3 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94fd897f/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js index 60cc989..226ff93 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js @@ -43,6 +43,16 @@ App.HighAvailabilityWizardController = App.WizardController.extend({ failedTask : null }), + setCurrentStep: function (currentStep, completed) { + this._super(currentStep, completed); + App.clusterStatus.setClusterStatus({ + clusterName: this.get('content.cluster.name'), + clusterState: 'HIGH_AVAILABILITY_DEPLOY', + wizardControllerName: 'highAvailabilityWizardController', + localdb: App.db.data + }); + }, + /** * return new object extended from clusterStatusTemplate * @return Object http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94fd897f/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 42eaad0..bb7076c 100644 --- a/ambari-web/app/routes/high_availability_routes.js +++ b/ambari-web/app/routes/high_availability_routes.js @@ -227,12 +227,6 @@ module.exports = Em.Route.extend({ var controller = router.get('highAvailabilityWizardController'); controller.setCurrentStep('6'); controller.setLowerStepsDisable(6); - App.clusterStatus.setClusterStatus({ - clusterName: this.get('content.cluster.name'), - clusterState: 'HIGH_AVAILABILITY_DEPLOY', - wizardControllerName: this.get('content.controllerName'), - localdb: App.db.data - }); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); controller.connectOutlet('highAvailabilityWizardStep6', controller.get('content')); @@ -273,12 +267,6 @@ module.exports = Em.Route.extend({ var controller = router.get('highAvailabilityWizardController'); controller.setCurrentStep('8'); controller.setLowerStepsDisable(8); - App.clusterStatus.setClusterStatus({ - clusterName: this.get('content.cluster.name'), - clusterState: 'HIGH_AVAILABILITY_DEPLOY', - wizardControllerName: this.get('content.controllerName'), - localdb: App.db.data - }); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); controller.connectOutlet('highAvailabilityWizardStep8', controller.get('content')); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/94fd897f/ambari-web/app/routes/rollbackHA_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/rollbackHA_routes.js b/ambari-web/app/routes/rollbackHA_routes.js index a2daeef..f9f2e41 100644 --- a/ambari-web/app/routes/rollbackHA_routes.js +++ b/ambari-web/app/routes/rollbackHA_routes.js @@ -89,7 +89,6 @@ module.exports = Em.Route.extend({ route: '/step2', connectOutlets: function (router) { var controller = router.get('rollbackHighAvailabilityWizardController'); - controller.setCurrentStep('2'); App.clusterStatus.setClusterStatus({ clusterName: router.get('content.cluster.name'), clusterState: 'ROLLBACK_HIGH_AVAILABILITY',
