You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2017/09/28 13:24:58 UTC
[09/50] [abbrv] ambari git commit: AMBARI-22042 Final Properties
filter does not work for Config Groups. (atkach)
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/eb5bcef3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb5bcef3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb5bcef3
Branch: refs/heads/branch-3.0-perf
Commit: eb5bcef3d4382ae059e572c45c799969c6cb7dde
Parents: 06d21bb
Author: Andrii Tkach <at...@apache.org>
Authored: Mon Sep 25 13:50:49 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Mon Sep 25 13:57:17 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/eb5bcef3/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 a53f6cd..fe45c79 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -272,7 +272,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;
}
});