Author: lektran
Date: Sat Aug 28 09:46:48 2010
New Revision: 990332
URL:
http://svn.apache.org/viewvc?rev=990332&view=revLog:
Replace date condition with in-memory date filtering
Modified:
ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java?rev=990332&r1=990331&r2=990332&view=diff==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/contact/ContactMechWorker.java Sat Aug 28 09:46:48 2010
@@ -481,10 +481,10 @@ public class ContactMechWorker {
List<EntityCondition> conditionList = FastList.newInstance();
conditionList.add(EntityCondition.makeCondition("facilityId", facilityId));
conditionList.add(EntityCondition.makeCondition("contactMechPurposeTypeId", purposeType));
- conditionList.add(EntityCondition.makeConditionDate("fromDate", "thruDate"));
EntityCondition entityCondition = EntityCondition.makeCondition(conditionList);
try {
facilityContactMechPurposes = delegator.findList("FacilityContactMechPurpose", entityCondition, null, UtilMisc.toList("-fromDate"), null, true);
+ facilityContactMechPurposes = EntityUtil.filterByDate(facilityContactMechPurposes);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}
@@ -494,10 +494,10 @@ public class ContactMechWorker {
conditionList = FastList.newInstance();
conditionList.add(EntityCondition.makeCondition("facilityId", facilityId));
conditionList.add(EntityCondition.makeCondition("contactMechId", contactMechId));
- conditionList.add(EntityCondition.makeConditionDate("fromDate", "thruDate"));
entityCondition = EntityCondition.makeCondition(conditionList);
try {
facilityContactMechs = delegator.findList("FacilityContactMech", entityCondition, null, UtilMisc.toList("-fromDate"), null, true);
+ facilityContactMechs = EntityUtil.filterByDate(facilityContactMechs);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);
}