Author: jleroux Date: Wed Oct 30 17:13:39 2013 New Revision: 1537180 URL: http://svn.apache.org/r1537180 Log: "Applied fix from trunk for revision: 1537179 " ------------------------------------------------------------------------ r1537179 | jleroux | 2013-10-30 18:11:21 +0100 (mer. 30 oct. 2013) | 5 lignes
A patch from Christian Carlow for "Wrap error messages in StringUtil.wrapString() for framework/common/webcommon/includes/messages.ftl" https://issues.apache.org/jira/browse/OFBIZ-5376 Without wrapping error messages in StringUtil.wrapString() the <br/> element appears part of the error message. ------------------------------------------------------------------------ Modified: ofbiz/branches/release12.04/ (props changed) ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl Propchange: ofbiz/branches/release12.04/ ------------------------------------------------------------------------------ Merged /ofbiz/trunk:r1537179 Modified: ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl?rev=1537180&r1=1537179&r2=1537180&view=diff ============================================================================== --- ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl (original) +++ ofbiz/branches/release12.04/framework/common/webcommon/includes/messages.ftl Wed Oct 30 17:13:39 2013 @@ -40,26 +40,25 @@ under the License. <div id="content-messages" class="content-messages errorMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingErrorsOccurred}:</p> <#if errorMessage?has_content> - <p>${errorMessage}</p> + <p>${StringUtil.wrapString(errorMessage)}</p> </#if> <#if errorMessageList?has_content> <#list errorMessageList as errorMsg> - <p>${errorMsg}</p> + <p>${StringUtil.wrapString(errorMsg)}</p> </#list> </#if> </div> </#if> - <#-- display the event messages --> <#if (eventMessage?has_content || eventMessageList?has_content)> <div id="content-messages" class="content-messages eventMessage" onclick="document.getElementById('content-messages').parentNode.removeChild(this)"> <p>${uiLabelMap.CommonFollowingOccurred}:</p> <#if eventMessage?has_content> - <p>${eventMessage}</p> + <p>${StringUtil.wrapString(eventMessage)}</p> </#if> <#if eventMessageList?has_content> <#list eventMessageList as eventMsg> - <p>${eventMsg}</p> + <p>${StringUtil.wrapString(eventMsg)}</p> </#list> </#if> </div>
