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 61FEE104BA for ; Thu, 2 Jan 2014 17:37:52 +0000 (UTC) Received: (qmail 47135 invoked by uid 500); 2 Jan 2014 17:36:22 -0000 Delivered-To: apmail-ambari-commits-archive@ambari.apache.org Received: (qmail 47012 invoked by uid 500); 2 Jan 2014 17:36:09 -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 46860 invoked by uid 99); 2 Jan 2014 17:35:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jan 2014 17:35:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6FB51911F99; Thu, 2 Jan 2014 17:35:53 +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: X-Mailer: ASF-Git Admin Mailer Subject: git commit: AMBARI-4211 Empty content of review step in Add Host wizard. (atkach) Date: Thu, 2 Jan 2014 17:35:53 +0000 (UTC) Updated Branches: refs/heads/trunk b4ad188e1 -> e66947e81 AMBARI-4211 Empty content of review step in Add Host wizard. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e66947e8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e66947e8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e66947e8 Branch: refs/heads/trunk Commit: e66947e815c599afbee8634eca1a5f0b530ba232 Parents: b4ad188 Author: atkach Authored: Thu Jan 2 19:35:49 2014 +0200 Committer: atkach Committed: Thu Jan 2 19:35:49 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step8_controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e66947e8/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index ea1b605..58e1e05 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -84,9 +84,11 @@ App.WizardStep8Controller = Em.Controller.extend({ App.router.get('mainAdminSecurityController').setSecurityStatus(); } this.clearStep(); - this.formatProperties(); - this.loadGlobals(); - this.loadConfigs(); + if (this.get('content.serviceConfigProperties')) { + this.formatProperties(); + this.loadGlobals(); + this.loadConfigs(); + } this.loadClusterInfo(); this.loadServices(); this.set('isSubmitDisabled', false);