You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/03/08 11:58:58 UTC
svn commit: r1575511 - in /ofbiz/branches/release12.04: ./
framework/widget/templates/htmlFormMacroLibrary.ftl
Author: jleroux
Date: Sat Mar 8 10:58:57 2014
New Revision: 1575511
URL: http://svn.apache.org/r1575511
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/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1575508
Modified: ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1575511&r1=1575510&r2=1575511&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release12.04/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Mar 8 10:58:57 2014
@@ -597,10 +597,10 @@ Parameter: initiallyCollapsed, Not used.
Parameter: lastViewName, String, optional - If the ajaxEnabled parameter is true, the contents of lastViewName will be appended to the Ajax URL.
-->
<#macro renderLookupField name formName fieldFormName className="" alert="false" value="" size="" maxlength="" id="" event="" action="" readonly=false autocomplete="" descriptionFieldName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled=javaScriptEnabled presentation="layer" width="" height="" position="" fadeBackground="true" clearText="" showDescription="" initiallyCollapsed="" lastViewName="main" >
-<#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)>
-<!-- @renderLookupField -->
-</#if>
-<#if (!ajaxUrl?has_content) && ajaxEnabled>
+ <#if Static["org.ofbiz.widget.ModelWidget"].widgetBoundaryCommentsEnabled(context)>
+ <!-- @renderLookupField -->
+ </#if>
+ <#if (!ajaxUrl?has_content) && ajaxEnabled?has_content && ajaxEnabled>
<#local ajaxUrl = requestAttributes._REQUEST_HANDLER_.makeLink(request, response, fieldFormName)/>
<#local ajaxUrl = id + "," + ajaxUrl + ",ajaxLookup=Y" />
</#if>