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 2013/12/25 14:06:50 UTC
[2/2] git commit: AMBARI-4003 Add Service Wizard: Customize Services
configs are not displayed. (Denys Buzhor via atkach)
AMBARI-4003 Add Service Wizard: Customize Services configs are not displayed. (Denys Buzhor via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aafadc5d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aafadc5d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aafadc5d
Branch: refs/heads/trunk
Commit: aafadc5d5072e5daa63daed2fa2934492cc5753c
Parents: d522edb
Author: atkach <at...@hortonworks.com>
Authored: Wed Dec 25 15:06:29 2013 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Wed Dec 25 15:06:29 2013 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/installer.js | 8 --------
ambari-web/app/controllers/main/service/add_controller.js | 4 +++-
ambari-web/app/controllers/wizard.js | 10 +++++++++-
ambari-web/app/routes/add_service_routes.js | 3 +++
4 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/aafadc5d/ambari-web/app/controllers/installer.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/installer.js b/ambari-web/app/controllers/installer.js
index 358542e..0bf7e6b 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -311,14 +311,6 @@ App.InstallerController = App.WizardController.extend({
this.set('content.advancedServiceConfig', this.getDBProperty('advancedServiceConfig'));
},
- /**
- * Load config groups from local DB
- */
- loadServiceConfigGroups: function () {
- var serviceConfigGroups = this.getDBProperty('serviceConfigGroups') || [];
- this.set('content.configGroups', serviceConfigGroups);
- console.log("InstallerController.configGroups: loaded config ", serviceConfigGroups);
- },
/**
* Load information about hosts with clients components
http://git-wip-us.apache.org/repos/asf/ambari/blob/aafadc5d/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 12039db..7d73262 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -51,7 +51,8 @@ App.AddServiceController = App.WizardController.extend({
masterComponentHosts: null,
serviceConfigProperties: null,
advancedServiceConfig: null,
- controllerName: 'addServiceController'
+ controllerName: 'addServiceController',
+ configGroups: []
}),
setCurrentStep: function (currentStep, completed) {
@@ -388,6 +389,7 @@ App.AddServiceController = App.WizardController.extend({
case '5':
this.load('cluster');
case '4':
+ this.loadServiceConfigGroups();
this.loadServiceConfigProperties();
case '3':
this.loadServices();
http://git-wip-us.apache.org/repos/asf/ambari/blob/aafadc5d/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index d6e6e25..2a1351f 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -518,6 +518,14 @@ App.WizardController = Em.Controller.extend({
this.set('content.services', apiService);
this.setDBProperty('service',apiService);
},
+ /**
+ * Load config groups from local DB
+ */
+ loadServiceConfigGroups: function () {
+ var serviceConfigGroups = this.getDBProperty('serviceConfigGroups') || [];
+ this.set('content.configGroups', serviceConfigGroups);
+ console.log("InstallerController.configGroups: loaded config ", serviceConfigGroups);
+ },
registerErrPopup: function (header, message) {
App.ModalPopup.show({
@@ -760,4 +768,4 @@ App.WizardController = Em.Controller.extend({
this.setDBProperty('serviceConfigGroups', serviceConfigGroups);
this.set('content.serviceConfigProperties', serviceConfigGroups);
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/ambari/blob/aafadc5d/ambari-web/app/routes/add_service_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_service_routes.js b/ambari-web/app/routes/add_service_routes.js
index bc4e16b..1c845e1 100644
--- a/ambari-web/app/routes/add_service_routes.js
+++ b/ambari-web/app/routes/add_service_routes.js
@@ -205,6 +205,9 @@ module.exports = Em.Route.extend({
var addServiceController = router.get('addServiceController');
var wizardStep7Controller = router.get('wizardStep7Controller');
addServiceController.saveServiceConfigProperties(wizardStep7Controller);
+ if (App.supports.hostOverrides) {
+ addServiceController.saveServiceConfigGroups(wizardStep7Controller);
+ }
router.transitionTo('step5');
}
}),