Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 71B14200D16 for ; Tue, 26 Sep 2017 07:19:56 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7047E1609EB; Tue, 26 Sep 2017 05:19:56 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B190E1609BB for ; Tue, 26 Sep 2017 07:19:55 +0200 (CEST) Received: (qmail 76429 invoked by uid 500); 26 Sep 2017 05:19:54 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 76413 invoked by uid 99); 26 Sep 2017 05:19:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2017 05:19:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 54743DFF0F; Tue, 26 Sep 2017 05:19:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jluniya@apache.org To: commits@ambari.apache.org Date: Tue, 26 Sep 2017 05:20:27 -0000 Message-Id: <35200cb7768943adbfe1c97d0f18b25e@git.apache.org> In-Reply-To: <4212965aea334cb693fcda96bee147f2@git.apache.org> References: <4212965aea334cb693fcda96bee147f2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] ambari git commit: AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach) archived-at: Tue, 26 Sep 2017 05:19:56 -0000 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-feature-AMBARI-14714 Commit: eb5bcef3d4382ae059e572c45c799969c6cb7dde Parents: 06d21bb Author: Andrii Tkach Authored: Mon Sep 25 13:50:49 2017 +0300 Committer: Andrii Tkach 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; } });