Author: adrianc
Date: Wed Jul 27 18:28:39 2011
New Revision: 1151582
URL: http://svn.apache.org/viewvc?rev=1151582&view=rev
Log:
Fixed a bug in the getWorkEffortEventsByPeriod service - all recurring events
were appearing in all calendars.
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1151582&r1=1151581&r2=1151582&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Wed Jul 27 18:28:39 2011
@@ -622,15 +622,14 @@ public class WorkEffortServices {
entityExprList.addAll(periodCheckAndlList);
// (non cancelled) recurring events
+ /* Commenting this out. This condition adds ALL recurring events to
ALL calendars.
List<EntityCondition> recurringEvents =
UtilMisc.<EntityCondition>toList(EntityCondition.makeCondition("tempExprId",
EntityOperator.NOT_EQUAL, null));
if (filterOutCanceledEvents.booleanValue()) {
recurringEvents.addAll(cancelledCheckAndList);
}
+ */
- EntityCondition eclTotal =
EntityCondition.makeCondition(UtilMisc.toList(
- EntityCondition.makeCondition(entityExprList,
EntityJoinOperator.AND),
- EntityCondition.makeCondition(recurringEvents,
EntityJoinOperator.AND)
- ), EntityJoinOperator.OR);
+ EntityCondition eclTotal =
EntityCondition.makeCondition(entityExprList, EntityJoinOperator.AND);
List<String> orderByList = UtilMisc.toList("estimatedStartDate");
try {
