You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ak...@apache.org on 2014/09/17 17:15:25 UTC
git commit: AMBARI-7365. Resource Manager HA wizard appears after
closing and page refresh. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c09edb729 -> 892f423c8
AMBARI-7365. Resource Manager HA wizard appears after closing and page refresh. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/892f423c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/892f423c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/892f423c
Branch: refs/heads/trunk
Commit: 892f423c8266ddaf205cc74d8996dd2a378928d2
Parents: c09edb7
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Wed Sep 17 18:12:03 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Wed Sep 17 18:13:47 2014 +0300
----------------------------------------------------------------------
.../resourceManager/wizard_controller.js | 1 -
ambari-web/app/routes/rm_high_availability_routes.js | 12 ++++++++----
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/892f423c/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js
index 697bd13..c5a3e9e 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/wizard_controller.js
@@ -44,7 +44,6 @@ App.RMHighAvailabilityWizardController = App.WizardController.extend({
this._super(currentStep, completed);
App.clusterStatus.setClusterStatus({
clusterName: this.get('content.cluster.name'),
- clusterState: 'RM_HIGH_AVAILABILITY_DEPLOY',
wizardControllerName: 'rMHighAvailabilityWizardController',
localdb: App.db.data
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/892f423c/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 a7a83dd..1739a4f 100644
--- a/ambari-web/app/routes/rm_high_availability_routes.js
+++ b/ambari-web/app/routes/rm_high_availability_routes.js
@@ -22,8 +22,12 @@ module.exports = App.WizardRoute.extend({
route: '/highAvailability/ResourceManager/enable',
enter: function (router,transition) {
+ var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController');
+ rMHighAvailabilityWizardController.dataLoading().done(function () {
+ //Set YARN as current service
+ App.router.set('mainServiceItemController.content', App.Service.find().findProperty('serviceName', 'YARN'));
+ });
Em.run.next(function () {
- var rMHighAvailabilityWizardController = router.get('rMHighAvailabilityWizardController');
App.router.get('updateController').set('isWorking', false);
var popup = App.ModalPopup.show({
classNames: ['full-width-modal'],
@@ -50,7 +54,7 @@ module.exports = App.WizardRoute.extend({
localdb: App.db.data
}, {alwaysCallback: function () {
self.hide();
- router.route('/main/services/YARN/summary');
+ router.transitionTo('main.services.index');
location.reload();
}});
}, Em.I18n.t('admin.rm_highAvailability.closePopup'));
@@ -58,7 +62,7 @@ module.exports = App.WizardRoute.extend({
this.hide();
rMHighAvailabilityWizardController.setCurrentStep('1');
router.get('updateController').set('isWorking', true);
- router.route('/main/services/YARN/summary');
+ router.transitionTo('main.services.index');
}
},
didInsertElement: function () {
@@ -181,7 +185,7 @@ module.exports = App.WizardRoute.extend({
localdb: App.db.data
}, {alwaysCallback: function () {
controller.get('popup').hide();
- router.route('/main/services/YARN/summary');
+ router.transitionTo('main.services.index');
location.reload();
}});
}