svn commit: r943180 - in /ofbiz/branches/release10.04: ./ applications/product/src/org/ofbiz/product/category/CategoryServices.java

[doogie-3]

Author: doogie
Date: Tue May 11 17:09:06 2010
New Revision: 943180

URL: http://svn.apache.org/viewvc?rev=943180&view=rev
Log:
Applied fix from trunk for revision: 942883
 Fix entity name selection when a releaseDate filter is specified.

Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryServices.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 11 17:09:06 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942884,943168
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,941007,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168

Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=943180&r1=943179&r2=943180&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryServices.java Tue May 11 17:09:06 2010
@@ -153,7 +153,7 @@ public class CategoryServices {
 
     private static String getCategoryFindEntityName(Delegator delegator, List<String> orderByFields, Timestamp introductionDateLimit, Timestamp releaseDateLimit) {
         // allow orderByFields to contain fields from the Product entity, if there are such fields
-        String entityName = introductionDateLimit == null || releaseDateLimit != null ? "ProductCategoryMember" : "ProductAndCategoryMember";
+        String entityName = introductionDateLimit == null && releaseDateLimit == null ? "ProductCategoryMember" : "ProductAndCategoryMember";
         if (orderByFields == null) {
             return entityName;
         }