Updated Branches: refs/heads/trunk a0993a734 -> dd35bed89
AMBARI-3194 NameNode HA wizard: after HA rollback popup, routing to admin->High Availability fails. (atkach) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/dd35bed8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/dd35bed8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/dd35bed8 Branch: refs/heads/trunk Commit: dd35bed89c64e5137e7bfde29d213b70543c92c7 Parents: a0993a7 Author: atkach <[email protected]> Authored: Thu Sep 12 13:54:40 2013 +0300 Committer: atkach <[email protected]> Committed: Thu Sep 12 13:54:40 2013 +0300 ---------------------------------------------------------------------- .../highAvailability/progress_controller.js | 2 +- ambari-web/app/routes/main.js | 110 ++++++++++--------- 2 files changed, 60 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dd35bed8/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js index 03f3826..f55bd49 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -117,7 +117,7 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle primary: Em.I18n.t('common.confirm'), showCloseButton: false, onPrimary: function () { - App.router.transitionTo('root.main.admin.adminHighAvailability.rollback'); + App.router.transitionTo('main.admin.highAvailabilityRollback'); this.hide(); }, secondary : Em.I18n.t('common.cancel'), http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dd35bed8/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index bc51aa4..4384578 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -649,65 +649,73 @@ module.exports = Em.Route.extend({ adminHighAvailability: Em.Route.extend({ route: '/highAvailability', - connectOutlets: function (router) { - router.set('mainAdminController.category', "highAvailability"); - router.get('mainAdminController').connectOutlet('mainAdminHighAvailability'); + enter: function (router) { + Em.run.next(function () { + router.transitionTo('adminHighAvailability.index'); + }); }, + index: Ember.Route.extend({ + route: '/', + connectOutlets: function (router, context) { + router.set('mainAdminController.category', "highAvailability"); + router.get('mainAdminController').connectOutlet('mainAdminHighAvailability'); + } + }) + }), - rollback: Ember.Route.extend({ - route: '/rollback', - enter: function (router) { - //after refresh check if the wizard is open then restore it - Ember.run.next(function () { - App.router.get('updateController').set('isWorking', false); + highAvailabilityRollback: Ember.Route.extend({ + route: '/highAvailability/rollback', + enter: function (router) { + //after refresh check if the wizard is open then restore it + Ember.run.next(function () { + App.router.get('updateController').set('isWorking', false); - var highAvailabilityWizardController = router.get('highAvailabilityWizardController'); - if(highAvailabilityWizardController.get('popup')){ - highAvailabilityWizardController.finish(); - highAvailabilityWizardController.get('popup').hide(); - } - var popup = App.ModalPopup.show({ - classNames: ['full-width-modal'], - header: Em.I18n.t('admin.highAvailability.rollback.header'), - bodyClass: App.HighAvailabilityRollbackView.extend({ - controllerBinding: 'App.router.highAvailabilityRollbackController' - }), - showCloseButton: false, - primary: Em.I18n.t('form.cancel'), - secondary: null, - showFooter: false, - - onClose: function () { - var self = this; - var controller = router.get('highAvailabilityRollbackController'); + var highAvailabilityWizardController = router.get('highAvailabilityWizardController'); + if(highAvailabilityWizardController.get('popup')){ + highAvailabilityWizardController.finish(); + highAvailabilityWizardController.get('popup').hide(); + } + var popup = App.ModalPopup.show({ + classNames: ['full-width-modal'], + header: Em.I18n.t('admin.highAvailability.rollback.header'), + bodyClass: App.HighAvailabilityRollbackView.extend({ + controllerBinding: 'App.router.highAvailabilityRollbackController' + }), + showCloseButton: false, + primary: Em.I18n.t('form.cancel'), + secondary: null, + showFooter: false, + + onClose: function () { + var self = this; + var controller = router.get('highAvailabilityRollbackController'); // if (!controller.get('isSubmitDisabled')) { - self.proceedOnClose(); + self.proceedOnClose(); // } - }, - proceedOnClose: function () { - App.router.get('updateController').set('isWorking', true); - /*App.clusterStatus.setClusterStatus({ - clusterName: router.get('content.cluster.name'), - clusterState: 'HIGH_AVAILABILITY_DISABLED', - wizardControllerName: router.get('highAvailabilityRollbackController.name'), - localdb: App.db.data - });*/ - this.hide(); - router.transitionTo('main.admin.adminHighAvailability'); - }, - didInsertElement: function () { - this.fitHeight(); - } - }); - router.set('highAvailabilityRollbackController.popup', popup); + }, + proceedOnClose: function () { + App.router.get('updateController').set('isWorking', true); + App.clusterStatus.setClusterStatus({ + clusterName: router.get('content.cluster.name'), + clusterState: 'HIGH_AVAILABILITY_DISABLED', + wizardControllerName: router.get('highAvailabilityRollbackController.name'), + localdb: App.db.data + }); + this.hide(); + router.transitionTo('main.admin.adminHighAvailability'); + }, + didInsertElement: function () { + this.fitHeight(); + } }); + router.set('highAvailabilityRollbackController.popup', popup); + }); - }, + }, - unroutePath: function () { - return false; - } - }) + unroutePath: function () { + return false; + } }), enableHighAvailability: require('routes/high_availability_routes'),
