svn commit: r1548143 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1548143 - /ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

jleroux@apache.org
Author: jleroux
Date: Thu Dec  5 14:06:39 2013
New Revision: 1548143

URL: http://svn.apache.org/r1548143
Log:
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/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1548143&r1=1548142&r2=1548143&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Thu Dec  5 14:06:39 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>&nbsp;${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>