Author: ashish
Date: Fri Jun 24 14:07:41 2016
New Revision: 1750110
URL: http://svn.apache.org/viewvc?rev=1750110&view=rev
Log:
Applied patch from trunk r1750109.
======================================
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/release15.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
Modified:
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=1750110&r1=1750109&r2=1750110&view=diff
==============================================================================
---
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
(original)
+++
ofbiz/branches/release15.12/applications/order/webapp/ordermgr/return/returnItemInc.ftl
Fri Jun 24 14:07:41 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")}
