Repository: ambari Updated Branches: refs/heads/branch-1.7.0 79d1642c7 -> d23b086d1
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/c9df1e9b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9df1e9b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9df1e9b Branch: refs/heads/branch-1.7.0 Commit: c9df1e9b7607ba1ecdc1eaee7e24ddc84d16333f Parents: fa13f7d Author: aBabiichuk <[email protected]> Authored: Thu Oct 30 17:07:41 2014 +0200 Committer: aBabiichuk <[email protected]> Committed: Fri Oct 31 18:06:38 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/c9df1e9b/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index ecaa9ae..0c9fa72 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -1205,7 +1205,7 @@ App.config = Em.Object.create({ return configData; }, - complexConfigs: [ + complexConfigsTemplate: [ { "id": "site property", "name": "capacity-scheduler", @@ -1237,7 +1237,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'; @@ -1264,7 +1265,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');
