|
@@ -435,7 +435,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
|
|
|
this.set('_fileNamesToUpdate', fileNamesToUpdate);
|
|
|
}
|
|
|
var notDefaultGroup = !!selectedConfigGroup;
|
|
|
- var parentPropertiesNames = parentConfigs ? parentConfigs.mapProperty('name') : [];
|
|
|
+ var parentPropertiesNames = parentConfigs ? parentConfigs.map(function(p) { return App.config.configId(Em.get(p, 'name'), Em.get(p, 'type'))}) : [];
|
|
|
/** get all configs by config group **/
|
|
|
for (var key in configObject) {
|
|
|
|
|
@@ -472,7 +472,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
|
|
|
initialValue = validator.isValidFloat(initialValue) ? parseFloat(initialValue).toString() : initialValue;
|
|
|
recommendedValue = validator.isValidFloat(recommendedValue) ? parseFloat(recommendedValue).toString() : recommendedValue;
|
|
|
|
|
|
- if (!updateOnlyBoundaries && !parentPropertiesNames.contains(propertyName) && initialValue != recommendedValue) { //on first initial request we don't need to change values
|
|
|
+ if (!updateOnlyBoundaries && !parentPropertiesNames.contains(App.config.configId(propertyName, key)) && initialValue != recommendedValue) { //on first initial request we don't need to change values
|
|
|
if (dependentProperty) {
|
|
|
Em.set(dependentProperty, 'value', initialValue);
|
|
|
Em.set(dependentProperty, 'recommendedValue', recommendedValue);
|