You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/06/20 11:47:01 UTC
svn commit: r786778 -
/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Author: hansbak
Date: Sat Jun 20 09:47:01 2009
New Revision: 786778
URL: http://svn.apache.org/viewvc?rev=786778&view=rev
Log:
Calendar was showing events of all parties, not by default the logged on user
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=786778&r1=786777&r2=786778&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 Sat Jun 20 09:47:01 2009
@@ -480,10 +480,9 @@
partyIdsToUse.add(userLogin.getString("partyId"));
}
}
-
List<EntityCondition> entityExprList = UtilGenerics.checkList(context.get("entityExprList"));
if (entityExprList == null) {
- entityExprList = getDefaultWorkEffortExprList(partyIds, facilityId, fixedAssetId, workEffortTypeId);
+ entityExprList = getDefaultWorkEffortExprList(partyIdsToUse, facilityId, fixedAssetId, workEffortTypeId);
}
// check the start dates
@@ -525,7 +524,7 @@
if (partyIdsToUse.size() > 0 || UtilValidate.isNotEmpty(facilityId) || UtilValidate.isNotEmpty(fixedAssetId)) {
try {
List<GenericValue> tempWorkEfforts = null;
- if (UtilValidate.isNotEmpty(partyIds)) {
+ if (UtilValidate.isNotEmpty(partyIdsToUse)) {
tempWorkEfforts = EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssign", ecl, null, orderByList, null, false));
} else if (UtilValidate.isNotEmpty(fixedAssetId)) {
// Get "old style" work efforts and "new style" work efforts