svn commit: r1575510 - in /ofbiz/branches/release13.07: ./ framework/widget/templates/htmlFormMacroLibrary.ftl

Author: jleroux
Date: Sat Mar  8 10:58:55 2014
New Revision: 1575510

URL: http://svn.apache.org/r1575510
Log:
"Applied fix from trunk for revision: 1575508"
------------------------------------------------------------------------
r1575508 | jleroux | 2014-03-08 11:55:39 +0100 (sam. 08 mars 2014) | 10 lignes

Fixes a bug reported by Rong Nguyen "Error when first login and change password" https://issues.apache.org/jira/browse/OFBIZ-5564

Scenario:
 1. Load-seed
 2. Create-admin-user
 3. Access: /catalog/control/main
 4. Login
 5. Change password for the first use
 
After password change, web browser redirect user to /catalog/control/main with an error
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release13.07/   (props changed)
    ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl

Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1575508

Modified: ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1575510&r1=1575509&r2=1575510&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Mar  8 10:58:55 2014
@@ -618,7 +618,7 @@ Parameter: lastViewName, String, optiona
   <#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)>
   <!-- @renderLookupField -->
   </#if>
-  <#if (!ajaxUrl?has_content) && ajaxEnabled>
+  <#if (!ajaxUrl?has_content) && ajaxEnabled?has_content && ajaxEnabled>
     <#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/>
     <#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" />
   </#if>