You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/12/21 09:23:51 UTC
ambari git commit: AMBARI-14432 Service config page on AS and
Installed loads to long. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk b61f6eafa -> 7d0da5ae5
AMBARI-14432 Service config page on AS and Installed loads to long. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7d0da5ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7d0da5ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7d0da5ae
Branch: refs/heads/trunk
Commit: 7d0da5ae57ecf3a4863a32011fa11e17f14eb7e7
Parents: b61f6ea
Author: Andrii Babiichuk <ab...@hortonworks.com>
Authored: Mon Dec 21 10:09:01 2015 +0200
Committer: Andrii Babiichuk <ab...@hortonworks.com>
Committed: Mon Dec 21 10:09:01 2015 +0200
----------------------------------------------------------------------
.../app/controllers/wizard/step7_controller.js | 33 ++++++++++----------
1 file changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7d0da5ae/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 c098e10..608b163 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -818,27 +818,26 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
};
var configsByService = {}, dependencies = this.get('configDependencies');
- stepConfigs.forEach(function (service) {
- if (!configsByService[service.get('serviceName')]) {
- configsByService[service.get('serviceName')] = service.get('configs');
+ configs.forEach(function (_config) {
+ if (!configsByService[_config.serviceName]) {
+ configsByService[_config.serviceName] = [];
}
- if (['addServiceController', 'installerController'].contains(this.get('wizardController.name'))) {
- this.addHostNamesToConfigs(service, localDB.masterComponentHosts, localDB.slaveComponentHosts);
+ var serviceConfigProperty = App.ServiceConfigProperty.create(_config);
+ this.updateHostOverrides(serviceConfigProperty, _config);
+ if (this.get('wizardController.name') === 'addServiceController') {
+ this._updateIsEditableFlagForConfig(serviceConfigProperty, true);
+ }
+ if (!this.get('content.serviceConfigProperties.length') && !serviceConfigProperty.get('hasInitialValue')) {
+ App.ConfigInitializer.initialValue(serviceConfigProperty, localDB, dependencies);
}
+ serviceConfigProperty.validate();
+ configsByService[_config.serviceName].pushObject(serviceConfigProperty);
}, this);
- configs.forEach(function (_config) {
- if (configsByService[_config.serviceName]) {
- var serviceConfigProperty = App.ServiceConfigProperty.create(_config);
- this.updateHostOverrides(serviceConfigProperty, _config);
- if (this.get('wizardController.name') === 'addServiceController') {
- this._updateIsEditableFlagForConfig(serviceConfigProperty, true);
- }
- if (!this.get('content.serviceConfigProperties.length') && !serviceConfigProperty.get('hasInitialValue')) {
- App.ConfigInitializer.initialValue(serviceConfigProperty, localDB, dependencies);
- }
- serviceConfigProperty.validate();
- configsByService[_config.serviceName].pushObject(serviceConfigProperty);
+ stepConfigs.forEach(function (service) {
+ service.set('configs', configsByService[service.get('serviceName')]);
+ if (['addServiceController', 'installerController'].contains(this.get('wizardController.name'))) {
+ this.addHostNamesToConfigs(service, localDB.masterComponentHosts, localDB.slaveComponentHosts);
}
}, this);
return stepConfigs;