You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/11/13 16:06:21 UTC
ambari git commit: AMBARI-8309. 'Enable RM HA' wizard appears after
restarting browser (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 6f915a4e4 -> 05a62644c
AMBARI-8309. 'Enable RM HA' wizard appears after restarting browser (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/05a62644
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/05a62644
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/05a62644
Branch: refs/heads/trunk
Commit: 05a62644c5cade198bd18bfa44cc2b111e35d252
Parents: 6f915a4
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Nov 13 16:08:48 2014 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Nov 13 17:05:42 2014 +0200
----------------------------------------------------------------------
.../app/routes/rm_high_availability_routes.js | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/05a62644/ambari-web/app/routes/rm_high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/rm_high_availability_routes.js b/ambari-web/app/routes/rm_high_availability_routes.js
index 1739a4f..3d31533 100644
--- a/ambari-web/app/routes/rm_high_availability_routes.js
+++ b/ambari-web/app/routes/rm_high_availability_routes.js
@@ -40,11 +40,11 @@ module.exports = App.WizardRoute.extend({
secondary: null,
onClose: function () {
- var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController');
- var currStep = rMHighAvailabilityWizardController.get('currentStep');
+ var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController'),
+ currStep = rMHighAvailabilityWizardController.get('currentStep'),
+ self = this;
if (parseInt(currStep) === 4) {
- var self = this;
App.showConfirmationPopup(function () {
router.get('updateController').set('isWorking', true);
rMHighAvailabilityWizardController.finish();
@@ -59,10 +59,17 @@ module.exports = App.WizardRoute.extend({
}});
}, Em.I18n.t('admin.rm_highAvailability.closePopup'));
} else {
- this.hide();
- rMHighAvailabilityWizardController.setCurrentStep('1');
router.get('updateController').set('isWorking', true);
- router.transitionTo('main.services.index');
+ rMHighAvailabilityWizardController.finish();
+ App.clusterStatus.setClusterStatus({
+ clusterName: App.router.getClusterName(),
+ clusterState: 'DEFAULT',
+ localdb: App.db.data
+ }, {alwaysCallback: function () {
+ self.hide();
+ router.transitionTo('main.services.index');
+ location.reload();
+ }});
}
},
didInsertElement: function () {