Return-Path: X-Original-To: apmail-ambari-commits-archive@www.apache.org Delivered-To: apmail-ambari-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9354D1027F for ; Thu, 26 Feb 2015 18:29:42 +0000 (UTC) Received: (qmail 56992 invoked by uid 500); 26 Feb 2015 18:29:42 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 56963 invoked by uid 500); 26 Feb 2015 18:29:42 -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 56954 invoked by uid 99); 26 Feb 2015 18:29:42 -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; Thu, 26 Feb 2015 18:29:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 47EB0E08E9; Thu, 26 Feb 2015 18:29:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yusaku@apache.org To: commits@ambari.apache.org Message-Id: <41f7fdf2d47f4b48b51905ac0853ce85@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-9813. 'Restart required' panel. Number of affected components differs from popup window count (alexantonenko) Date: Thu, 26 Feb 2015 18:29:42 +0000 (UTC) Repository: ambari Updated Branches: refs/heads/branch-2.0.0 1cb8512e3 -> fb0f4f5a9 AMBARI-9813. 'Restart required' panel. Number of affected components differs from popup window count (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb0f4f5a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb0f4f5a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb0f4f5a Branch: refs/heads/branch-2.0.0 Commit: fb0f4f5a9e48e02a06e0787c0d2cce72e66fd6e2 Parents: 1cb8512 Author: Alex Antonenko Authored: Thu Feb 26 16:35:30 2015 +0200 Committer: Yusaku Sako Committed: Thu Feb 26 10:29:33 2015 -0800 ---------------------------------------------------------------------- ambari-web/app/mappers/component_config_mapper.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fb0f4f5a/ambari-web/app/mappers/component_config_mapper.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mappers/component_config_mapper.js b/ambari-web/app/mappers/component_config_mapper.js index f9f5926..c1f6429 100644 --- a/ambari-web/app/mappers/component_config_mapper.js +++ b/ambari-web/app/mappers/component_config_mapper.js @@ -52,7 +52,8 @@ App.componentConfigMapper = App.QuickDataMapper.create({ }); this.get('model').find().forEach(function (hostComponent) { var hostComponentJson = hostComponentJsonMap[hostComponent.get('id')]; - if (!hostComponentJson && !hostComponent.get('isMaster')) { + if (!hostComponentJson && + !App.StackServiceComponent.find().findProperty('componentName', hostComponent.get('componentName')).get('isMaster')) { hostComponent.set('staleConfigs', false); } if (hostComponentJson!=null && hostComponent.get('staleConfigs') &&