summaryrefslogtreecommitdiff
path: root/ambari-web/app/utils/config.js
diff options
context:
space:
mode:
Diffstat (limited to 'ambari-web/app/utils/config.js')
-rw-r--r--ambari-web/app/utils/config.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 3dd89268c3..40f5d8791a 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -1154,16 +1154,18 @@ App.config = Em.Object.create({
* Merge values in "stored" to "base" if name matches, it's a value only merge.
* @param base {Array} Em.Object
* @param stored {Array} Object
+ * @returns {Object[]|Em.Object[]} base
*/
mergeStoredValue: function(base, stored) {
if (stored) {
base.forEach(function (p) {
- var sp = stored.filterProperty("filename", p.filename).findProperty("name", p.name);
+ var sp = stored.filterProperty('filename', p.filename).findProperty('name', p.name);
if (sp) {
- p.set("value", sp.value);
+ Em.set(p, 'value', Em.get(sp, 'value'));
}
});
}
+ return base;
},