Repository: ambari Updated Branches: refs/heads/branch-2.1 99c5d3f48 -> 027d6a2b5
AMBARI-14112 Config comparison results in blank screen due to JS error. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/027d6a2b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/027d6a2b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/027d6a2b Branch: refs/heads/branch-2.1 Commit: 027d6a2b575a276e795692288c24738a1c8cc15c Parents: 99c5d3f Author: aBabiichuk <[email protected]> Authored: Mon Nov 30 15:43:28 2015 +0200 Committer: aBabiichuk <[email protected]> Committed: Mon Nov 30 15:43:28 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/mixins/common/configs/configs_comparator.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/027d6a2b/ambari-web/app/mixins/common/configs/configs_comparator.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js index 5208b5d..de7bd77 100644 --- a/ambari-web/app/mixins/common/configs/configs_comparator.js +++ b/ambari-web/app/mixins/common/configs/configs_comparator.js @@ -325,8 +325,8 @@ App.ConfigsComparator = Em.Mixin.create({ isMock: true, displayType: 'label' }; - var category = App.config.identifyCategory(undefinedConfig); - undefinedConfig.category = category && category.name; + var isStackProperty = App.StackConfigProperty.find(App.config.configId(name, filename)).get('id'); + undefinedConfig.category = App.config.getDefaultCategory(isStackProperty, filename); return App.ServiceConfigProperty.create(undefinedConfig); },
