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 2013/12/10 16:26:16 UTC
git commit: AMBARI-4029. Installer Step2: Can't proceed next after
return from Step7. (akovalenko)
Updated Branches:
refs/heads/trunk f1a904841 -> 142f51b64
AMBARI-4029. Installer Step2: Can't proceed next after return from Step7. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/142f51b6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/142f51b6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/142f51b6
Branch: refs/heads/trunk
Commit: 142f51b6443462360f7404a35875ca2dead18d03
Parents: f1a9048
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Dec 10 17:22:04 2013 +0200
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Dec 10 17:22:04 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/info/configs.js | 7 ++++---
ambari-web/app/controllers/wizard/step7_controller.js | 2 +-
ambari-web/app/routes/installer.js | 4 ++++
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/142f51b6/ambari-web/app/controllers/main/service/info/configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js
index d72d3a7..29b288d 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -1981,12 +1981,13 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
var subViewController = this.get('subViewController');
var selectedConfigGroup = subViewController.get('selectedConfigGroup');
var managedConfigGroups = subViewController.get('configGroups');
+ // do not save config groups in wizards if Cancel or Close button is clicked
if (!(onClose && controller)) {
+ if (!controller) {
+ controller = App.router.get('mainServiceInfoConfigsController');
+ }
controller.set('configGroups', managedConfigGroups);
}
- if (!controller) {
- controller = App.router.get('mainServiceInfoConfigsController');
- }
//check whether selectedConfigGroup was selected
if (selectedConfigGroup && controller.get('configGroups').someProperty('name', selectedConfigGroup.get('name'))) {
controller.set('selectedConfigGroup', selectedConfigGroup);
http://git-wip-us.apache.org/repos/asf/ambari/blob/142f51b6/ambari-web/app/controllers/wizard/step7_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js
index 9709409..2bd85a5 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -429,6 +429,6 @@ App.WizardStep7Controller = Em.Controller.extend({
)
}
return App.Host.find();
- }.property('content')
+ }.property('content.hosts')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/142f51b6/ambari-web/app/routes/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/installer.js b/ambari-web/app/routes/installer.js
index 5de1864..c8ddbf8 100644
--- a/ambari-web/app/routes/installer.js
+++ b/ambari-web/app/routes/installer.js
@@ -169,6 +169,9 @@ module.exports = Em.Route.extend({
var controller = router.get('installerController');
controller.setCurrentStep('2');
controller.loadAllPriorSteps();
+ if (App.Host.find().content.length) {
+ App.Host.find().clear();
+ }
controller.connectOutlet('wizardStep2', controller.get('content'));
},
back: Em.Router.transitionTo('step1'),
@@ -284,6 +287,7 @@ module.exports = Em.Route.extend({
controller.get('content').set('serviceConfigProperties', null);
controller.setDBProperty('serviceConfigProperties', null);
controller.setDBProperty('advancedServiceConfig', null);
+ controller.setDBProperty('serviceConfigGroups', null);
controller.loadAdvancedConfigs();
router.transitionTo('step7');
}