You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2012/05/12 23:21:37 UTC
svn commit: r1337682 -
/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
Author: doogie
Date: Sat May 12 21:21:37 2012
New Revision: 1337682
URL: http://svn.apache.org/viewvc?rev=1337682&view=rev
Log:
DEPRECATION: specialpurpose/projectmgr: findByPrimaryKey variants
replaced with findOne
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1337682&r1=1337681&r2=1337682&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Sat May 12 21:21:37 2012
@@ -39,7 +39,7 @@ if (!partyId) {
timesheet = null;
timesheetId = parameters.timesheetId;
if (timesheetId) {
- timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : timesheetId]);
+ timesheet = delegator.findOne("Timesheet", ["timesheetId" : timesheetId], false);
partyId = timesheet.partyId; // use the party from this timesheet
} else {
// make sure because of timezone changes, not a duplicate timesheet is created
@@ -55,7 +55,7 @@ if (timesheetId) {
if (timesheet == null) {
result = dispatcher.runSync("createProjectTimesheet", ["userLogin" : parameters.userLogin, "partyId" : partyId]);
if (result && result.timesheetId) {
- timesheet = delegator.findByPrimaryKey("Timesheet", ["timesheetId" : result.timesheetId]);
+ timesheet = delegator.findOne("Timesheet", ["timesheetId" : result.timesheetId], false);
}
}
}
@@ -64,7 +64,7 @@ context.timesheet = timesheet;
context.weekNumber = UtilDateTime.weekNumber(timesheet.fromDate);
// get the user names
-context.partyNameView = delegator.findByPrimaryKey("PartyNameView",["partyId" : partyId]);
+context.partyNameView = delegator.findOne("PartyNameView",["partyId" : partyId], false);
// get the default rate for this person
rateTypes = EntityUtil.filterByDate(delegator.findByAnd("PartyRate", ["partyId" : partyId, "defaultRate" : "Y"]));
if (rateTypes) {