From: "Adam Heath" <[email protected]>
On 06/03/2012 07:20 AM, [email protected] wrote:
Author: jleroux
Date: Sun Jun 3 12:20:48 2012
New Revision: 1345661
URL: http://svn.apache.org/viewvc?rev=1345661&view=rev
Log:
Revert r1345660, I was caught by the cache I thought it was only that when
another change I put before was also needed
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy?rev=1345661&r1=1345660&r2=1345661&view=diff
==============================================================================
---
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
(original)
+++
ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductSummary.groovy
Sun Jun 3 12:20:48 2012
@@ -33,7 +33,6 @@ import org.ofbiz.product.store.*;
import org.ofbiz.order.shoppingcart.*;
import org.ofbiz.product.product.ProductWorker;
import java.text.NumberFormat;
-import javolution.util.FastList;
//either optProduct, optProductId or productId must be specified
product = request.getAttribute("optProduct");
@@ -134,7 +133,7 @@ if (product) {
boolean isAlternativePacking =
ProductWorker.isAlternativePacking(delegator, product.productId, null);
mainProducts = [];
if(isAlternativePacking){
- productVirtualVariants = delegator.findByAnd("ProductAssoc",
UtilMisc.toMap("productIdTo", product.productId ,
"productAssocTypeId", "ALTERNATIVE_PACKAGE"), true);
+ productVirtualVariants = delegator.findByAnd("ProductAssoc",
UtilMisc.toMap("productIdTo", product.productId ,
"productAssocTypeId", "ALTERNATIVE_PACKAGE"), null, true);
Is this a line that I missed? Or is this a line you added recently, but didn't
use the new methods I've added? In either case,
there should still be the old, deprecated methods that would allow it to
continue to work.
See updated comment done just after the commit at
http://svn.apache.org/viewvc?view=revision&revision=1345661
Actually the old, deprecated method with this signature seems to any longer
exist. That's why I warned about the other
instances. So maybe a commplete fix would be to re-add the the old, deprecated
method with this signature
This commit can stay as is
Jacques
if(productVirtualVariants){
productVirtualVariants.each { virtualVariantKey ->
mainProductMap = [:];
