Repository: ambari Updated Branches: refs/heads/trunk df98ca9e4 -> 297a35896
AMBARI-8038 Capacity scheduler change always show blue highlight after compare. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f2e955e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f2e955e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f2e955e Branch: refs/heads/trunk Commit: 9f2e955e1fe35d89440d09cc04a0af4f37bd0ce1 Parents: adbf453 Author: aBabiichuk <[email protected]> Authored: Thu Oct 30 17:05:02 2014 +0200 Committer: aBabiichuk <[email protected]> Committed: Thu Oct 30 18:29:48 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/utils/config.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9f2e955e/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 72226c5..0b5ebf7 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -1144,7 +1144,7 @@ App.config = Em.Object.create({ return configData; }, - complexConfigs: [ + complexConfigsTemplate: [ { "id": "site property", "name": "capacity-scheduler", @@ -1176,7 +1176,8 @@ App.config = Em.Object.create({ var fileConfigs = configs.filterProperty('filename', filename); var value = ''; var defaultValue = ''; - var complexConfig = this.get('complexConfigs').findProperty('filename', filename); + var template = this.get('complexConfigsTemplate').findProperty('filename', filename); + var complexConfig = $.extend({}, template); if (complexConfig) { fileConfigs.forEach(function (_config) { value += _config.name + '=' + _config.value + '\n'; @@ -1203,7 +1204,7 @@ App.config = Em.Object.create({ * @return {*} */ textareaIntoFileConfigs: function (configs, filename) { - var complexConfigName = this.get('complexConfigs').findProperty('filename', filename).name; + var complexConfigName = this.get('complexConfigsTemplate').findProperty('filename', filename).name; var configsTextarea = configs.findProperty('name', complexConfigName); if (configsTextarea) { var properties = configsTextarea.get('value').split('\n');
