You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2016/06/24 14:08:25 UTC
svn commit: r1750111 -
/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
Author: ashish
Date: Fri Jun 24 14:08:25 2016
New Revision: 1750111
URL: http://svn.apache.org/viewvc?rev=1750111&view=rev
Log:
Applied patch from jira issue - OFBIZ-7347 - If promo text contains any HTML elements elements, it is not getting properly rendered on order return screen. Thanks Pritam for the contribution.
Modified:
ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=1750111&r1=1750110&r2=1750111&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl Fri Jun 24 14:08:25 2016
@@ -69,7 +69,7 @@ under the License.
<td colspan="4">
<input type="hidden" name="returnAdjustmentTypeId_o_${rowCount}" value="${returnAdjustmentType}"/>
<input type="hidden" name="orderAdjustmentId_o_${rowCount}" value="${orderItem.orderAdjustmentId}"/>
- ${description?default("N/A")}
+ ${StringUtil.wrapString(description)?default("N/A")}
</td>
<td>
${orderItem.amount?string("##0.00")}