Repository: ambari Updated Branches: refs/heads/trunk e82e68c18 -> 988775704
AMBARI-17837 Enable NN HA wiz: closing wiz on step 6, will leave it running for all other cluster users. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98877570 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98877570 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98877570 Branch: refs/heads/trunk Commit: 988775704926370e5783a81ca1aefe07d45e95fa Parents: e82e68c Author: Andrii Tkach <[email protected]> Authored: Thu Jul 21 20:48:13 2016 +0300 Committer: Andrii Tkach <[email protected]> Committed: Fri Jul 22 11:56:33 2016 +0300 ---------------------------------------------------------------------- .../admin/highAvailability/progress_controller.js | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/98877570/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 5e22b41..9039b9d 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/progress_controller.js @@ -35,21 +35,8 @@ App.HighAvailabilityProgressPageController = App.HighAvailabilityWizardControlle var controller = App.router.get('highAvailabilityWizardController'); controller.clearTasksData(); controller.clearStorageData(); - controller.finish(); - App.router.get('updateController').set('isWorking', true); - App.clusterStatus.setClusterStatus({ - clusterName: App.router.get('content.cluster.name'), - clusterState: 'DEFAULT', - localdb: App.db.data - }, { - alwaysCallback: function () { - self.hide(); - App.router.transitionTo('main.index'); - Em.run.next(function () { - location.reload(); - }); - } - }); + controller.resetOnClose(controller, 'main.services.index'); + this.hide(); }, secondary: Em.I18n.t('no'), onSecondary: function () {
