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 2013/12/05 15:08:00 UTC
svn commit: r1548145 - in /ofbiz/branches/release12.04: ./
applications/order/webapp/ordermgr/order/orderitems.ftl
Author: jleroux
Date: Thu Dec 5 14:07:59 2013
New Revision: 1548145
URL: http://svn.apache.org/r1548145
Log:
"Applied fix from trunk for revision: 1548143 "
------------------------------------------------------------------------
r1548143 | jleroux | 2013-12-05 15:06:39 +0100 (jeu. 05 déc. 2013) | 4 lignes
A patch from Christian Carlow for "HTML embedded in entity fields is rendered as text rather than HTML elements when using FTL" https://issues.apache.org/jira/browse/OFBIZ-5376
StringUtil.wrapString is now employed as it is on the order items section of the order creation review page.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderitems.ftl
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1548143
Modified: ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1548145&r1=1548144&r2=1548145&view=diff
==============================================================================
--- ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/release12.04/applications/order/webapp/ordermgr/order/orderitems.ftl Thu Dec 5 14:07:59 2013
@@ -413,7 +413,7 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)}
- ${orderItemAdjustment.get("description",locale)?if_exists}
+ ${StringUtil.wrapString(orderItemAdjustment.get("description",locale)?if_exists)}
<#if orderItemAdjustment.comments?has_content>
(${orderItemAdjustment.comments?default("")})
</#if>