You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2016/07/22 08:55:19 UTC
ambari git commit: AMBARI-17837 Enable NN HA wiz: closing wiz on step
6, will leave it running for all other cluster users. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 b88e6e231 -> ee6ea3c28
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/ee6ea3c2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee6ea3c2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee6ea3c2
Branch: refs/heads/branch-2.4
Commit: ee6ea3c28b220ddcb83b53e8ab2554f5f4232af4
Parents: b88e6e2
Author: Andrii Tkach <at...@apache.org>
Authored: Thu Jul 21 20:48:13 2016 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Fri Jul 22 11:52:37 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/ee6ea3c2/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 () {