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 BAC8610EB5 for ; Wed, 18 Dec 2013 19:04:45 +0000 (UTC) Received: (qmail 2826 invoked by uid 500); 18 Dec 2013 19:04:45 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 2794 invoked by uid 500); 18 Dec 2013 19:04:45 -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 2787 invoked by uid 99); 18 Dec 2013 19:04:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Dec 2013 19:04:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5088A95E7; Wed, 18 Dec 2013 19:04:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: alexantonenko@apache.org To: commits@ambari.apache.org Message-Id: <7939a3d6fc614f308f49e3ad8994db88@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4114. JS error on HA Step 3. (alexantonenko) Date: Wed, 18 Dec 2013 19:04:45 +0000 (UTC) Updated Branches: refs/heads/branch-1.4.3 ee5bd5963 -> eb14b87c1 AMBARI-4114. JS error on HA Step 3. (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eb14b87c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eb14b87c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eb14b87c Branch: refs/heads/branch-1.4.3 Commit: eb14b87c13c4c1c86210ec2383d019eac7f9ac77 Parents: ee5bd59 Author: Alex Antonenko Authored: Wed Dec 18 21:02:41 2013 +0200 Committer: Alex Antonenko Committed: Wed Dec 18 21:02:41 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/views/common/configs/services_config.js | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/eb14b87c/ambari-web/app/views/common/configs/services_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js index e262d36..23bd56e 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -66,6 +66,9 @@ App.ServiceConfigView = Em.View.extend({ */ checkCanEdit: function () { var controller = App.get('router.'+this.get('controller.name')); + if(!this.get('controller.selectedService.configCategories')){ + return; + } var canAddProperty = true; if(controller.get('selectedConfigGroup') && !controller.get('selectedConfigGroup').isDefault){ canAddProperty = false;