|
@@ -277,10 +277,10 @@ App.config = Em.Object.create({
|
|
|
for (var index in properties) {
|
|
|
var id = this.configId(index, siteConfig.type);
|
|
|
var configsPropertyDef = this.get('preDefinedSitePropertiesMap')[id];
|
|
|
- var advancedConfig = App.StackConfigProperty.find().findProperty('id', id);
|
|
|
-
|
|
|
- var template = this.createDefaultConfig(index, filename, !!advancedConfig, configsPropertyDef);
|
|
|
- var serviceConfigObj = this.mergeStaticProperties(template, advancedConfig);
|
|
|
+ var advancedConfig = App.StackConfigProperty.find(id);
|
|
|
+ var isStackProperty = !!advancedConfig.get('id');
|
|
|
+ var template = this.createDefaultConfig(index, filename, isStackProperty, configsPropertyDef);
|
|
|
+ var serviceConfigObj = isStackProperty ? this.mergeStaticProperties(template, advancedConfig) : template;
|
|
|
|
|
|
if (serviceConfigObj.isRequiredByAgent !== false) {
|
|
|
var formattedValue = this.formatPropertyValue(serviceConfigObj, properties[index]);
|