Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D1ADBE575 for ; Fri, 11 Jan 2013 00:56:59 +0000 (UTC) Received: (qmail 74724 invoked by uid 500); 11 Jan 2013 00:56:59 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 74700 invoked by uid 500); 11 Jan 2013 00:56:59 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 74692 invoked by uid 99); 11 Jan 2013 00:56:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2013 00:56:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Jan 2013 00:56:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6DE7323889BB; Fri, 11 Jan 2013 00:56:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1431770 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/service/info/configs.js Date: Fri, 11 Jan 2013 00:56:37 -0000 To: ambari-commits@incubator.apache.org From: yusaku@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130111005637.6DE7323889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: yusaku Date: Fri Jan 11 00:56:37 2013 New Revision: 1431770 URL: http://svn.apache.org/viewvc?rev=1431770&view=rev Log: AMBARI-1151. Reconfigure fails silently; it's not firing any API calls due to a JS error. (yusaku) Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431770&r1=1431769&r2=1431770&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 00:56:37 2013 @@ -667,6 +667,9 @@ AMBARI-666 branch (unreleased changes) BUG FIXES + AMBARI-1151. Reconfigure fails silently; it's not firing any API calls due + to a JS error. (yusaku) + AMBARI-1098. Switching services does not update various UI elements. (Srimanth Gunturi via yusaku) Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1431770&r1=1431769&r2=1431770&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js (original) +++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js Fri Jan 11 00:56:37 2013 @@ -569,7 +569,10 @@ App.MainServiceInfoConfigsController = E if (this.get('globalConfigs').someProperty('name', templateName[index])) { //console.log("The name of the variable is: " + this.get('content.serviceConfigProperties').findProperty('name', templateName[index]).name); var globValue = this.get('globalConfigs').findProperty('name', templateName[index]).value; - value = value.replace(_express, globValue); + // TODO: hack to make reconfig work for now due to some hive params breaking reconfig in general + if (value != null) { + value = value.replace(_express, globValue); + } } else { /* console.log("ERROR: The variable name is: " + templateName[index]);