AMBARI-11686. NameNode HA: going back and forth between Select Hosts and Review page adds additional NameNodes (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75bce8ae Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75bce8ae Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75bce8ae Branch: refs/heads/trunk Commit: 75bce8aee6fa8b4f68fca1a5aba483553401468a Parents: 36a1c66 Author: Alex Antonenko <hiv...@gmail.com> Authored: Thu Jun 4 16:35:06 2015 +0300 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Thu Jun 4 18:38:26 2015 +0300 ---------------------------------------------------------------------- .../admin/highAvailability/nameNode/wizard_controller.js | 5 +++++ ambari-web/app/routes/high_availability_routes.js | 8 ++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/75bce8ae/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js index d725bde..ae2fa60 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/nameNode/wizard_controller.js @@ -101,6 +101,11 @@ App.HighAvailabilityWizardController = App.WizardController.extend({ this.set('content.masterComponentHosts', masterComponentHosts); }, + clearMasterComponentHosts: function() { + this.set('content.masterComponentHosts', null); + this.setDBProperty('masterComponentHosts', null); + }, + saveHdfsUser: function () { App.db.setHighAvailabilityWizardHdfsUser(this.get('content.hdfsUser')); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/75bce8ae/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 c91929a..1e25ab3 100644 --- a/ambari-web/app/routes/high_availability_routes.js +++ b/ambari-web/app/routes/high_availability_routes.js @@ -130,6 +130,10 @@ module.exports = App.WizardRoute.extend({ step2: Em.Route.extend({ route: '/step2', + enter: function(router) { + var controller = router.get('highAvailabilityWizardController'); + controller.clearMasterComponentHosts(); + }, connectOutlets: function (router) { var controller = router.get('highAvailabilityWizardController'); controller.dataLoading().done(function () { @@ -137,7 +141,7 @@ module.exports = App.WizardRoute.extend({ controller.loadAllPriorSteps().done(function () { controller.connectOutlet('highAvailabilityWizardStep2', controller.get('content')); }); - }) + }); }, unroutePath: function () { return false; @@ -173,7 +177,7 @@ module.exports = App.WizardRoute.extend({ controller.loadAllPriorSteps().done(function () { controller.connectOutlet('highAvailabilityWizardStep3', controller.get('content')); }); - }) + }); }, unroutePath: function () { return false;
