Updated Branches: refs/heads/trunk f8d0acb83 -> 80751f135
AMBARI-4213 Master hosts are missing in Add Service wizard(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/80751f13 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/80751f13 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/80751f13 Branch: refs/heads/trunk Commit: 80751f135ab0a5f5ffc04d93ed1ca36d3ac20e47 Parents: f8d0acb Author: atkach <[email protected]> Authored: Fri Jan 3 18:15:00 2014 +0200 Committer: atkach <[email protected]> Committed: Fri Jan 3 18:15:00 2014 +0200 ---------------------------------------------------------------------- .../app/controllers/wizard/step7_controller.js | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/80751f13/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 86f3615..34b8592 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -217,29 +217,28 @@ App.WizardStep7Controller = Em.Controller.extend({ if (s.configsValidator) { s.configsValidator.set('recommendedDefaults', recommendedDefaults); } - configs.forEach(function (_serviceConfigProperty) { - console.log("config", _serviceConfigProperty); - if (!_serviceConfigProperty) return; - var overrides = _serviceConfigProperty.get('overrides'); + configs.forEach(function (serviceConfigProperty) { + console.log("config", serviceConfigProperty); + if (!serviceConfigProperty) return; + var overrides = serviceConfigProperty.get('overrides'); // we will populate the override properties below - _serviceConfigProperty.set('overrides', null); + serviceConfigProperty.set('overrides', null); - if (_serviceConfigProperty.isOverridable === undefined) { - _serviceConfigProperty.set('isOverridable', true); + if (serviceConfigProperty.isOverridable === undefined) { + serviceConfigProperty.set('isOverridable', true); } - if (_serviceConfigProperty.displayType === 'checkbox') { - switch (_serviceConfigProperty.value) { + if (serviceConfigProperty.displayType === 'checkbox') { + switch (serviceConfigProperty.value) { case 'true': - _serviceConfigProperty.set('value', true); - _serviceConfigProperty.set('defaultValue', true); + serviceConfigProperty.set('value', true); + serviceConfigProperty.set('defaultValue', true); break; case 'false': - _serviceConfigProperty.set('value', false); - _serviceConfigProperty.set('defaultValue', false); + serviceConfigProperty.set('value', false); + serviceConfigProperty.set('defaultValue', false); break; } } - var serviceConfigProperty = App.ServiceConfigProperty.create(_serviceConfigProperty); if (serviceConfigProperty.get('serviceName') === component.get('serviceName')) { if (s.configsValidator) { var validators = s.configsValidator.get('configValidators'); @@ -257,10 +256,10 @@ App.WizardStep7Controller = Em.Controller.extend({ } if (overrides != null) { overrides.forEach(function (override) { - var newSCP = App.ServiceConfigProperty.create(_serviceConfigProperty); + var newSCP = App.ServiceConfigProperty.create(serviceConfigProperty); newSCP.set('value', override.value); newSCP.set('isOriginalSCP', false); // indicated this is overridden value, - newSCP.set('parentSCP', _serviceConfigProperty); + newSCP.set('parentSCP', serviceConfigProperty); if (App.supports.hostOverrides && defaultGroupSelected) { var group = component.get('configGroups').findProperty('name', override.group.get('name')); // prevent cycle in proto object, clean link @@ -302,6 +301,7 @@ App.WizardStep7Controller = Em.Controller.extend({ } } }, + /** * On load function */
