svn commit: r1548146 - in /ofbiz/branches/release11.04: ./ applications/order/webapp/ordermgr/order/orderitems.ftl

Author: jleroux
Date: Thu Dec  5 14:08:03 2013
New Revision: 1548146

URL: http://svn.apache.org/r1548146
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/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderitems.ftl

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1548143

Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1548146&r1=1548145&r2=1548146&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/orderitems.ftl Thu Dec  5 14:08:03 2013
@@ -397,7 +397,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>