You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/05/11 12:36:23 UTC
svn commit: r655294 - in
/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions:
ListFilteredTasks.bsh ListProjectsByDateRange.bsh
ListTimeSheetByDateRange.bsh
Author: lektran
Date: Sun May 11 03:36:23 2008
New Revision: 655294
URL: http://svn.apache.org/viewvc?rev=655294&view=rev
Log:
Removed calls to deprecated findByConditionCache GenericDelegator methods from all bsh files
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh?rev=655294&r1=655293&r2=655294&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListFilteredTasks.bsh Sun May 11 03:36:23 2008
@@ -113,7 +113,7 @@
conditions.add(new EntityExpr("createdStamp", EntityOperator.LESS_THAN_EQUAL_TO, thruDate ));
allConditions = new EntityConditionList( conditions, EntityOperator.AND );
orderBy = UtilMisc.toList("createdStamp DESC");
- listProjects = delegator.findByConditionCache("WorkEffort", allConditions, null, orderBy );
+ listProjects = delegator.findList("WorkEffort", allConditions, null, orderBy, null, true);
List projects = new LinkedList();
itr = listProjects.iterator();
while (itr.hasNext()) {
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh?rev=655294&r1=655293&r2=655294&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListProjectsByDateRange.bsh Sun May 11 03:36:23 2008
@@ -47,9 +47,9 @@
if (!UtilValidate.isEmpty(thruDate)) {
conditions.add(new EntityExpr("createdStamp", EntityOperator.LESS_THAN_EQUAL_TO, thruDate ));
}
- allConditions = new EntityConditionList( conditions, EntityOperator.AND );
+ allConditions = new EntityConditionList(conditions, EntityOperator.AND);
orderBy = UtilMisc.toList("createdStamp DESC");
- listProjects = delegator.findByConditionCache("WorkEffort", allConditions, null, orderBy );
+ listProjects = delegator.findList("WorkEffort", allConditions, null, orderBy, null, true);
List projects = new LinkedList();
itr = listProjects.iterator();
while (itr.hasNext()) {
@@ -101,7 +101,7 @@
allConditions = new EntityConditionList( conditions, EntityOperator.AND );
orderBy = UtilMisc.toList("createdStamp DESC");
- tasks = delegator.findByConditionCache("WorkEffort", allConditions, null, orderBy );
+ tasks = delegator.findList("WorkEffort", allConditions, null, orderBy, null, true);
List unAssignedTasks = new LinkedList();
itr = tasks.iterator();
while (itr.hasNext()) {
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh?rev=655294&r1=655293&r2=655294&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ListTimeSheetByDateRange.bsh Sun May 11 03:36:23 2008
@@ -37,11 +37,11 @@
List timeSheetList = new LinkedList();
if ( !(UtilValidate.isEmpty(fromDate) || UtilValidate.isEmpty(thruDate))) {
List conditions = new LinkedList();
- conditions.add(new EntityExpr("createdStamp", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate ));
- conditions.add(new EntityExpr("createdStamp", EntityOperator.LESS_THAN_EQUAL_TO, thruDate ));
- allConditions = new EntityConditionList( conditions, EntityOperator.AND );
+ conditions.add(new EntityExpr("createdStamp", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
+ conditions.add(new EntityExpr("createdStamp", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
+ allConditions = new EntityConditionList(conditions, EntityOperator.AND);
orderBy = UtilMisc.toList("createdStamp DESC");
- timeSheetList = delegator.findByConditionCache("Timesheet", allConditions, null, orderBy );
+ timeSheetList = delegator.findList("Timesheet", allConditions, null, orderBy, null, true);
context.put("timeSheetList", timeSheetList);
} else {
if (findAll.equals("Y")) {