|
@@ -304,11 +304,12 @@ App.config = Em.Object.create({
|
|
var value = this.parseValue(properties[index], configsPropertyDef, advancedConfig);
|
|
var value = this.parseValue(properties[index], configsPropertyDef, advancedConfig);
|
|
var serviceConfigObj = Em.Object.create({
|
|
var serviceConfigObj = Em.Object.create({
|
|
name: index,
|
|
name: index,
|
|
|
|
+ displayName: (configsPropertyDef && Em.get(configsPropertyDef, 'displayName')) || index,
|
|
value: value,
|
|
value: value,
|
|
savedValue: value,
|
|
savedValue: value,
|
|
recommendedValue: advancedConfig ? Em.get(advancedConfig, 'recommendedValue') : null,
|
|
recommendedValue: advancedConfig ? Em.get(advancedConfig, 'recommendedValue') : null,
|
|
filename: filename,
|
|
filename: filename,
|
|
- isUserProperty: !advancedConfig,
|
|
|
|
|
|
+ isUserProperty: !configsPropertyDef,
|
|
isVisible: !!service,
|
|
isVisible: !!service,
|
|
isOverridable: true,
|
|
isOverridable: true,
|
|
isReconfigurable: true,
|
|
isReconfigurable: true,
|
|
@@ -336,7 +337,7 @@ App.config = Em.Object.create({
|
|
if (!this.getBySiteName(serviceConfigObj.get('filename')).someProperty('name', index)) {
|
|
if (!this.getBySiteName(serviceConfigObj.get('filename')).someProperty('name', index)) {
|
|
if (configsPropertyDef) {
|
|
if (configsPropertyDef) {
|
|
if (Em.get(configsPropertyDef, 'isRequiredByAgent') === false) {
|
|
if (Em.get(configsPropertyDef, 'isRequiredByAgent') === false) {
|
|
- configs.push(serviceConfigObj);
|
|
|
|
|
|
+ configs.push(App.ServiceConfigProperty.create(serviceConfigObj));
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
this.handleSpecialProperties(serviceConfigObj);
|
|
this.handleSpecialProperties(serviceConfigObj);
|