Author: doogie
Date: Tue May 29 04:19:56 2012
New Revision: 1343523
URL: http://svn.apache.org/viewvc?rev=1343523&view=rev
Log:
DEPRECATION: specialpurpose/projectmgr: GenericValue.getRelated/getRelatedCache
variants replaced with a getRelated that takes a boolean useCache parameter.
Modified:
ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
Modified:
ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=1343523&r1=1343522&r2=1343523&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
(original)
+++ ofbiz/trunk/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java
Tue May 29 04:19:56 2012
@@ -36,7 +36,7 @@ public class Various {
public static void setDatesFollowingTasks(GenericValue task) {
try {
- List<GenericValue> assocs = task.getRelated("FromWorkEffortAssoc");
+ List<GenericValue> assocs = task.getRelated("FromWorkEffortAssoc",
null, null, false);
if (UtilValidate.isNotEmpty(assocs)) {
for (GenericValue assoc : assocs) {
GenericValue nextTask =
assoc.getRelatedOne("ToWorkEffort", false);
@@ -59,7 +59,7 @@ public class Various {
Double plannedHours = 0.00;
try {
// get planned hours
- List<GenericValue> standards =
task.getRelated("WorkEffortSkillStandard");
+ List<GenericValue> standards =
task.getRelated("WorkEffortSkillStandard", null, null, false);
for (GenericValue standard : standards) {
if (standard.getDouble("estimatedNumPeople") == null) {
standard.put("estimatedNumPeople", new Double("1"));
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=1343523&r1=1343522&r2=1343523&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
Tue May 29 04:19:56 2012
@@ -84,7 +84,7 @@ void retrieveWorkEffortData() {
// get the planned number of hours
entryWorkEffort = lastTimeEntry.getRelatedOne("WorkEffort", false);
if (entryWorkEffort) {
- plannedHours =
entryWorkEffort.getRelated("WorkEffortSkillStandard");
+ plannedHours =
entryWorkEffort.getRelated("WorkEffortSkillStandard", null, null, false);
pHours = 0.00;
plannedHours.each { plannedHour ->
if (plannedHour.estimatedDuration) {
@@ -92,7 +92,7 @@ void retrieveWorkEffortData() {
}
}
entry.plannedHours = pHours;
- actualHours = entryWorkEffort.getRelated("TimeEntry");
+ actualHours = entryWorkEffort.getRelated("TimeEntry", null, null,
false);
aHours = 0.00;
actualHours.each { actualHour ->
if (actualHour.hours) {
@@ -130,7 +130,7 @@ void retrieveWorkEffortData() {
entry = ["timesheetId" : timesheet.timesheetId];
}
-timeEntries = timesheet.getRelated("TimeEntry", ["workEffortId", "rateTypeId",
"fromDate"]);
+timeEntries = timesheet.getRelated("TimeEntry", null, ["workEffortId",
"rateTypeId", "fromDate"], false);
te = timeEntries.iterator();
while (te.hasNext()) {
// only fill lastTimeEntry when not the first time
@@ -194,7 +194,7 @@ timesheets = new LinkedList();
timesheetsDb.each { timesheetDb ->
timesheet = [:];
timesheet.putAll(timesheetDb);
- entries = timesheetDb.getRelated("TimeEntry");
+ entries = timesheetDb.getRelated("TimeEntry", null, null, false);
hours = 0.00;
entries.each { timeEntry ->
if (timeEntry.hours) {
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy?rev=1343523&r1=1343522&r2=1343523&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy
Tue May 29 04:19:56 2012
@@ -24,12 +24,12 @@ import org.ofbiz.base.util.*;
custRequestList = delegator.findByAnd("CustRequest", ["fromPartyId" :
fromPartyId], ["-createdDate"], false);
if (custRequestList) {
- custReqTaskList =
custRequestList.get(0).getRelated("CustRequestWorkEffort");
+ custReqTaskList =
custRequestList.get(0).getRelated("CustRequestWorkEffort", null, null, false);
if (custReqTaskList) {
custReqTask = custReqTaskList.get(0).getRelatedOne("WorkEffort",
false); // phase
projectChildWorkEffort = custReqTask.getRelatedOne("ParentWorkEffort",
false); // phase name
if (projectChildWorkEffort) {
- partyList = custReqTask.getRelated("WorkEffortPartyAssignment");
+ partyList = custReqTask.getRelated("WorkEffortPartyAssignment",
null, null, false);
if (partyList) {
context.childWorkEffortId =
projectChildWorkEffort.workEffortId;
context.partyId= partyList.get(0).partyId;
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1343523&r1=1343522&r2=1343523&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl
Tue May 29 04:19:56 2012
@@ -35,7 +35,7 @@ under the License.
</tr>
<#list workEffortSurveyAppls as workEffortSurveyAppl>
<#if workEffortSurveyAppl?has_content>
- <#assign productStoreSurveyAppls =
workEffortSurveyAppl.getRelated("ProductStoreSurveyAppl")>
+ <#assign productStoreSurveyAppls =
workEffortSurveyAppl.getRelated("ProductStoreSurveyAppl", null, null, false)>
<#list productStoreSurveyAppls as productStoreSurveyAppl>
<#if productStoreSurveyAppl?has_content>
<#assign survey =
productStoreSurveyAppl.getRelatedOne("Survey", false)>
