Author: lektran
Date: Tue Jun 19 02:27:21 2007
New Revision: 548667
URL:
http://svn.apache.org/viewvc?view=rev&rev=548667Log:
Applied fix from trunk for revision: 548665
Modified:
ofbiz/branches/release4.0/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Modified: ofbiz/branches/release4.0/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?view=diff&rev=548667&r1=548666&r2=548667==============================================================================
--- ofbiz/branches/release4.0/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/branches/release4.0/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Tue Jun 19 02:27:21 2007
@@ -302,12 +302,9 @@
tempWorkEfforts = delegator.findByAnd("WorkEffort", entityExprList, UtilMisc.toList("estimatedStartDate"));
}
- // FIXME: I think that now the following code can be removed.
- // It was probably here to remove duplicated workeffort ids caused
- // by the query on the WorkEffortAndPartyAssign view when no party was
- // specified; now it is no more necessary since, when no party is specified,
- // the query is done on the WorkEffort entity.
- /*
+ // This block needs to be here to filter duplicate workeffort ids when
+ // more than one of the selected party ids is assigned to the WorkEffort
+
Set tempWeKeys = new HashSet();
Iterator tempWorkEffortIter = tempWorkEfforts.iterator();
while (tempWorkEffortIter.hasNext()) {
@@ -319,7 +316,7 @@
tempWeKeys.add(tempWorkEffortId);
}
}
- */
+
validWorkEfforts = new ArrayList(tempWorkEfforts);
} catch (GenericEntityException e) {
Debug.logWarning(e, module);