[ofbiz-framework] branch release18.12 updated: Fixed: View Image button on order view page fails to render the image (OFBIZ-11734)

[akashjain]

This is an automated email from the ASF dual-hosted git repository.

akashjain pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new a290fbb  Fixed: View Image button on order view page fails to render the image (OFBIZ-11734)
a290fbb is described below

commit a290fbb348438dd401ea5d3cfbd19e86f0ecb07d
Author: Akash Jain <[hidden email]>
AuthorDate: Tue Aug 4 15:58:56 2020 +0530

    Fixed: View Image button on order view page fails to render the image (OFBIZ-11734)
   
    Thanks, Arpit Mor for reporting.
---
 applications/order/template/order/EditOrderItems.ftl | 4 ----
 applications/order/template/order/OrderItems.ftl     | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/applications/order/template/order/EditOrderItems.ftl b/applications/order/template/order/EditOrderItems.ftl
index 2d49784..c23b9a8 100644
--- a/applications/order/template/order/EditOrderItems.ftl
+++ b/applications/order/template/order/EditOrderItems.ftl
@@ -65,7 +65,6 @@ under the License.
                 </tr>
                 <#list orderItemList as orderItem>
                     <#if orderItem.productId??> <#-- a null product may come from a quote -->
-                      <#assign orderItemContentWrapper = Static["org.apache.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)>
                       <tr><td colspan="8"><hr /></td></tr>
                       <tr>
                           <#assign orderItemType = orderItem.getRelatedOne("OrderItemType", false)!>
@@ -106,9 +105,6 @@ under the License.
                                   <div>
                                       <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
                                       <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a>
-                                      <#if orderItemContentWrapper.get("IMAGE_URL", "url")?has_content>
-                                      <a href="<@ofbizUrl>viewimage?orderId=${orderId}&amp;orderItemSeqId=${orderItem.orderItemSeqId}&amp;orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a>
-                                      </#if>
                                   </div>
                                   </#if>
                               </td>
diff --git a/applications/order/template/order/OrderItems.ftl b/applications/order/template/order/OrderItems.ftl
index 91c1ab5..900201a 100644
--- a/applications/order/template/order/OrderItems.ftl
+++ b/applications/order/template/order/OrderItems.ftl
@@ -45,7 +45,6 @@ under the License.
                 <#else>
                     <#assign itemClass = "2">
                     <#list orderItemList as orderItem>
-                        <#assign orderItemContentWrapper = Static["org.apache.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)>
                         <#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)>
                         <#if "SALES_ORDER" == orderHeader.orderTypeId><#assign pickedQty = orderReadHelper.getItemPickedQuantityBd(orderItem)></#if>
                         <tr<#if "1" == itemClass> class="alternate-row"</#if>>
@@ -89,10 +88,6 @@ under the License.
                                         </#if>
                                         <a href="/catalog/control/EditProduct?productId=${productId}${StringUtil.wrapString(externalKeyParam)}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a>
                                         <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a>
-                                        <#if orderItemContentWrapper.get("IMAGE_URL", "url")?has_content>
-                                            <a href="<@ofbizUrl>viewimage?orderId=${orderId}&amp;orderItemSeqId=${orderItem.orderItemSeqId}&amp;orderContentTypeId=IMAGE_URL</@ofbizUrl>"
-                                               target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a>
-                                        </#if>
                                     </div>
                                 </td>
                             </#if>