Author: jleroux
Date: Sat Mar  8 10:55:39 2014
New Revision: 1575508

URL: http://svn.apache.org/r1575508
Log:
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/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1575508&r1=1575507&r2=1575508&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Mar  8 
10:55:39 2014
@@ -619,7 +619,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>


Reply via email to