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 0F56D200B4A for ; Tue, 5 Jul 2016 10:53:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0E251160A4F; Tue, 5 Jul 2016 08:53:01 +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 58ED1160A60 for ; Tue, 5 Jul 2016 10:53:00 +0200 (CEST) Received: (qmail 31633 invoked by uid 500); 5 Jul 2016 08:52:59 -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 31387 invoked by uid 99); 5 Jul 2016 08:52:59 -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, 05 Jul 2016 08:52:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 67068DFB87; Tue, 5 Jul 2016 08:52:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: commits@ambari.apache.org Message-Id: <7ae0f7b99cc849c08067151545364ea5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-17553 Configs: Error counter from Settings tab reflects to config category from Advanced tab. (atkach) Date: Tue, 5 Jul 2016 08:52:59 +0000 (UTC) archived-at: Tue, 05 Jul 2016 08:53:01 -0000 Repository: ambari Updated Branches: refs/heads/branch-2.4 367941b5b -> e7b99822c AMBARI-17553 Configs: Error counter from Settings tab reflects to config category from Advanced tab. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7b99822 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7b99822 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7b99822 Branch: refs/heads/branch-2.4 Commit: e7b99822c9d576d1fa3833d0391f62d8fcaa28fd Parents: 367941b Author: Andrii Tkach Authored: Mon Jul 4 18:29:25 2016 +0300 Committer: Andrii Tkach Committed: Tue Jul 5 11:51:11 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/models/configs/objects/service_config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e7b99822/ambari-web/app/models/configs/objects/service_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/configs/objects/service_config.js b/ambari-web/app/models/configs/objects/service_config.js index a0cdca6..d07412a 100644 --- a/ambari-web/app/models/configs/objects/service_config.js +++ b/ambari-web/app/models/configs/objects/service_config.js @@ -59,7 +59,8 @@ App.ServiceConfig = Ember.Object.extend({ observeErrors: function() { this.get('configCategories').setEach('errorCount', 0); this.get('configsWithErrors').forEach(function(c) { - if (this.get('configCategoriesMap')[c.get('category')]) { + //configurations with widget shouldn't affect advanced category error counter + if (this.get('configCategoriesMap')[c.get('category')] && !c.get('widget')) { this.get('configCategoriesMap')[c.get('category')].incrementProperty('errorCount'); } }, this);