Author: jleroux
Date: Fri Mar 16 04:00:37 2007
New Revision: 518937
URL:
http://svn.apache.org/viewvc?view=rev&rev=518937Log:
A patch from Rashko Rejmer "Wrong invocation of the ProductContentWrapper.getProductContentAsText method due to 516158 revision" (
https://issues.apache.org/jira/browse/OFBIZ-820).
I checked there are no other similar problems.
Modified:
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl?view=diff&rev=518937&r1=518936&r2=518937==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/cart/showcart.ftl Fri Mar 16 04:00:37 2007
@@ -215,7 +215,7 @@
<#else>
<#assign parentProductId = cartLine.getProductId()/>
</#if>
- <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale)?if_exists>
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
<#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
<#if smallImageUrl?has_content>
<a href="<@ofbizUrl>product?product_id=${parentProductId}</@ofbizUrl>">
Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl?view=diff&rev=518937&r1=518936&r2=518937==============================================================================
--- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/order/splitship.ftl Fri Mar 16 04:00:37 2007
@@ -174,7 +174,7 @@
<#if cartLine.getProductId()?exists>
<#-- product item -->
<#-- start code to display a small image of the product -->
- <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale)?if_exists>
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
<#if !smallImageUrl?has_content><#assign smallImageUrl = "/images/defaultImage.jpg"></#if>
<#if smallImageUrl?has_content>
<a href="<@ofbizUrl>product?product_id=${cartLine.getProductId()}</@ofbizUrl>">