Repository: ambari Updated Branches: refs/heads/branch-2.6 c9dd8fbee -> 5e228910e
AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e228910 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e228910 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e228910 Branch: refs/heads/branch-2.6 Commit: 5e228910e86c91eb94ee5124b5db92f16d452e6d Parents: c9dd8fb Author: Andrii Tkach <[email protected]> Authored: Mon Sep 25 13:50:49 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Mon Sep 25 15:28:15 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/views/common/configs/service_config_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/5e228910/ambari-web/app/views/common/configs/service_config_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/service_config_view.js b/ambari-web/app/views/common/configs/service_config_view.js index d48ab16..6bded2c 100644 --- a/ambari-web/app/views/common/configs/service_config_view.js +++ b/ambari-web/app/views/common/configs/service_config_view.js @@ -271,7 +271,8 @@ App.ServiceConfigView = Em.View.extend({ var passesFilters = true; selectedFilters.forEach(function (filter) { - if (config.get(filter.attributeName) !== filter.attributeValue) { + if (config.get(filter.attributeName) !== filter.attributeValue && + !(config.get('overrides') && config.get('overrides').someProperty(filter.attributeName, filter.attributeValue))) { passesFilters = false; } });
