Author: doogie
Date: Mon May 10 20:05:38 2010
New Revision: 942883
URL: http://svn.apache.org/viewvc?rev=942883&view=rev
Log:
Fix entity name selection when a releaseDate filter is specified.
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
Modified:
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java?rev=942883&r1=942882&r2=942883&view=diff
==============================================================================
---
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
(original)
+++
ofbiz/trunk/applications/product/src/org/ofbiz/product/category/CategoryServices.java
Mon May 10 20:05:38 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;
}
