You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2009/05/01 02:45:52 UTC
svn commit: r770503 -
/ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
Author: lektran
Date: Fri May 1 00:45:52 2009
New Revision: 770503
URL: http://svn.apache.org/viewvc?rev=770503&view=rev
Log:
Merged from trunk r770501:
Fixed issue reported by Sascha Rodekamp on the user mailing list
enableEditValue was being treated like a boolean but was actually a String
Modified:
ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
Modified: ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=770503&r1=770502&r2=770503&view=diff
==============================================================================
--- ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/release09.04/framework/widget/templates/htmlScreenMacroLibrary.ftl Fri May 1 00:45:52 2009
@@ -27,18 +27,18 @@
<div<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if>>
</#macro>
<#macro renderContainerEnd></div></#macro>
-<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue><div class=${editContainerStyle}></#if></#macro>
+<#macro renderContentBegin editRequest enableEditValue editContainerStyle><#if editRequest?has_content && enableEditValue == "true"><div class=${editContainerStyle}></#if></#macro>
<#macro renderContentBody></#macro>
<#macro renderContentEnd urlString editMode editContainerStyle editRequest enableEditValue>
-<#if editRequest?exists && enableEditValue>
+<#if editRequest?exists && enableEditValue == "true">
<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
<#if editContainerStyle?exists></div><#rt/></#if>
</#if>
</#macro>
-<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue><div class="${editContainerStyle}"></#if></#macro>
+<#macro renderSubContentBegin editContainerStyle editRequest enableEditValue><#if editRequest?exists && enableEditValue == "true"><div class="${editContainerStyle}"></#if></#macro>
<#macro renderSubContentBody></#macro>
<#macro renderSubContentEnd>
-<#if editRequest?exists && enableEditValue>
+<#if editRequest?exists && enableEditValue == "true">
<#if urlString?exists><a href="${urlString}">${editMode}</a><#rt/></#if>
<#if editContainerStyle?exists></div><#rt/></#if>
</#if>