[OFBiz] SVN: r5955 - in trunk/applications/order/webapp/ordermgr: order reports

[sichen at svn.ofbiz.org]

Author: sichen
Date: 2005-10-13 17:32:00 -0500 (Thu, 13 Oct 2005)
New Revision: 5955

Modified:
   trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl
   trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl
Log:
Fixes OFBIZ-387: Ampersand in product name will break xsl:fo unless it is HTML-escaped. Fixed by appending freemarker ?xml directive to data that might contain unescaped ampersands. Thanks to Chris Juettner.

Modified: trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl	2005-10-13 21:56:28 UTC (rev 5954)
+++ trunk/applications/order/webapp/ordermgr/order/orderView.fo.ftl	2005-10-13 22:32:00 UTC (rev 5955)
@@ -207,11 +207,11 @@
                         <fo:table-cell>
                             <fo:block>
                                <#if productId?exists>
-                                ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?if_exists}
+                                ${orderItem.productId?default("N/A")} - ${orderItem.itemDescription?xml?if_exists}
                               <#elseif orderItemType?exists>
-                                ${orderItemType.description} - ${orderItem.itemDescription?if_exists}
+                                ${orderItemType.description} - ${orderItem.itemDescription?xml?if_exists}
                               <#else>
-                                ${orderItem.itemDescription?if_exists}
+                                ${orderItem.itemDescription?xml?if_exists}
                               </#if>
                                </fo:block>
                           </fo:table-cell>

Modified: trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl
===================================================================
--- trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl	2005-10-13 21:56:28 UTC (rev 5954)
+++ trunk/applications/order/webapp/ordermgr/reports/OrderPurchaseReportProduct.fo.ftl	2005-10-13 22:32:00 UTC (rev 5955)
@@ -103,7 +103,7 @@
                                 <fo:block>${orderPurchaseProductSummary.productId?if_exists}</fo:block>
                             </fo:table-cell>
                             <fo:table-cell padding="2pt" background-color="${rowColor}">
-                                <fo:block>${orderPurchaseProductSummary.internalName?if_exists}</fo:block>
+                                <fo:block>${orderPurchaseProductSummary.internalName?xml?if_exists}</fo:block>
                             </fo:table-cell>
                             <fo:table-cell padding="2pt" background-color="${rowColor}">
                                 <fo:block>${orderPurchaseProductSummary.quantity?if_exists}</fo:block>