Re: svn commit: r820204 - in /ofbiz/trunk: applications/product/src/org/ofbiz/product/product/ProductSearchSession.java specialpurpose/ecommerce/data/DemoProduct.xml

[Scott Gray]

Hi Ashish

Comment inline

Regards
Scott

On 30/09/2009, at 9:03 PM, ash...@apache.org wrote:

Author: ashish
Date: Wed Sep 30 08:03:27 2009
New Revision: 820204

URL: http://svn.apache.org/viewvc?rev=820204&view=rev
Log:


Modified:

  ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml


URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ProductSearchSession.java?rev=820204&r1=820203&r2=820204&view=diff

@@ -767,7 +767,7 @@
       }


       }

Putting the default value for prodSearchExcludeVariants=Y in ProductStore entity. (This is what at present happening OOTB) Also I had put a not-empty check so if someone forgot to put this value in demo data then by default it will include variant products. ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ ProductSearchSession.java Modified: ofbiz/trunk/applications/product/src/org/ofbiz/product/ product/ProductSearchSession.java = = = = = = = = ====================================================================== --- ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ ProductSearchSession.java (original) +++ ofbiz/trunk/applications/product/src/org/ofbiz/product/product/ ProductSearchSession.java Wed Sep 30 08:03:27 2009 // check the ProductStore to see if we should add the ExcludeVariantsConstraint - if (productStore != null && !"N".equals(productStore.getString("prodSearchExcludeVariants"))) { + if (productStore != null && UtilValidate .isNotEmpty(productStore.getString("prodSearchExcludeVariants")) && !"N".equals(productStore.getString("prodSearchExcludeVariants"))) { searchAddConstraint(new ProductSearch.ExcludeVariantsConstraint(), session); // not consider this a change for now, shouldn't change often: constraintsChanged = true;

Here you're change null == Y to null == N

I don't think it is a good idea to change the default behavior unless we have a good reason to do so, this would affect anyone taking an update who hasn't set this value in the past.

Modified: ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml?rev=820204&r1=820203&r2=820204&view=diff

@@ -57,7 +57,7 @@

= = = = = = = = ====================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/data/DemoProduct.xml Wed Sep 30 08:03:27 2009 authFraudMessage="Your order has been rejected and your account has been disabled due to fraud." authErrorMessage="Problem connecting to payment processor; we will continue to retry and notify you by email." storeCreditValidDays="90" storeCreditAccountEnumId="FIN_ACCOUNT" - visualThemeId="EC_DEFAULT" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y" showOutOfStockProducts="Y"/> + visualThemeId="EC_DEFAULT" prodSearchExcludeVariants="Y" autoApproveInvoice="Y" shipIfCaptureFails="Y" autoApproveOrder="Y" showOutOfStockProducts="Y"/> <!-- <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="testRandomAuthorize"/> --> <ProductStorePaymentSetting productStoreId="9000" paymentMethodTypeId="CREDIT_CARD" paymentServiceTypeEnumId="PRDS_PAY_AUTH" paymentService="alwaysApproveCCProcessor" paymentCustomMethodId="CC_AUTH_ALWAYSAPPROV"/>

smime.p7s
Description: S/MIME cryptographic signature