Author: doogie
Date: Tue May 29 04:15:53 2012
New Revision: 1343500
URL: http://svn.apache.org/viewvc?rev=1343500&view=rev
Log:
DEPRECATION: specialpurpose/projectmgr: getRelatedOne variants replaced with a
getRelatedOne variant 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/GanttChart.groovy
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.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=1343500&r1=1343499&r2=1343500&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:15:53 2012
@@ -39,7 +39,7 @@ public class Various {
List<GenericValue> assocs = task.getRelated("FromWorkEffortAssoc");
if (UtilValidate.isNotEmpty(assocs)) {
for (GenericValue assoc : assocs) {
- GenericValue nextTask =
assoc.getRelatedOne("ToWorkEffort");
+ GenericValue nextTask =
assoc.getRelatedOne("ToWorkEffort", false);
Timestamp newStartDate =
task.getTimestamp("estimatedCompletionDate"); // start of next task the next day
if (nextTask.get("estimatedStartDate") == null ||
nextTask.getTimestamp("estimatedStartDate").before(newStartDate)) {
nextTask.put("estimatedStartDate",
UtilDateTime.addDaysToTimestamp(task.getTimestamp("estimatedCompletionDate"),
1)); // start of next task the next day
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=1343500&r1=1343499&r2=1343500&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:15:53 2012
@@ -82,7 +82,7 @@ lastTimeEntry = null;
// retrieve work effort data when the workeffortId has changed.
void retrieveWorkEffortData() {
// get the planned number of hours
- entryWorkEffort = lastTimeEntry.getRelatedOne("WorkEffort");
+ entryWorkEffort = lastTimeEntry.getRelatedOne("WorkEffort", false);
if (entryWorkEffort) {
plannedHours =
entryWorkEffort.getRelated("WorkEffortSkillStandard");
pHours = 0.00;
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=1343500&r1=1343499&r2=1343500&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy
Tue May 29 04:15:53 2012
@@ -120,7 +120,7 @@ if (phases) {
preTasks = delegator.findByAnd("WorkEffortAssoc",
["workEffortIdTo" : task.workEffortId], ["workEffortIdFrom"], false);
latestTaskIds = new LinkedList();
preTasks.each { preTask ->
- wf = preTask.getRelatedOne("FromWorkEffort");
+ wf = preTask.getRelatedOne("FromWorkEffort", false);
latestTaskIds.add(wf.workEffortId);
}
if (UtilValidate.isNotEmpty(latestTaskIds)) {
Modified:
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy?rev=1343500&r1=1343499&r2=1343500&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy
(original)
+++
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy
Tue May 29 04:15:53 2012
@@ -34,7 +34,7 @@ orderBy = ["-fromDate"];
// check if latest invoice generated is still in process so allow
re-generation to correct errors
entryIterator = delegator.find("ProjectPhaseTaskAndTimeEntryTimeSheet",
entryExprs, null, null, orderBy, null);
while (entryItem = entryIterator.next()) {
- invoice = entryItem.getRelatedOne("Invoice");
+ invoice = entryItem.getRelatedOne("Invoice", false);
if (invoice.getString("statusId").equals("INVOICE_IN_PROCESS")) {
context.partyIdFrom = invoice.partyIdFrom;
context.partyId = invoice.partyId;
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=1343500&r1=1343499&r2=1343500&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:15:53 2012
@@ -26,8 +26,8 @@ custRequestList = delegator.findByAnd("C
if (custRequestList) {
custReqTaskList =
custRequestList.get(0).getRelated("CustRequestWorkEffort");
if (custReqTaskList) {
- custReqTask = custReqTaskList.get(0).getRelatedOne("WorkEffort"); //
phase
- projectChildWorkEffort =
custReqTask.getRelatedOne("ParentWorkEffort"); // phase name
+ custReqTask = custReqTaskList.get(0).getRelatedOne("WorkEffort",
false); // phase
+ projectChildWorkEffort = custReqTask.getRelatedOne("ParentWorkEffort",
false); // phase name
if (projectChildWorkEffort) {
partyList = custReqTask.getRelated("WorkEffortPartyAssignment");
if (partyList) {
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=1343500&r1=1343499&r2=1343500&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:15:53 2012
@@ -38,7 +38,7 @@ under the License.
<#assign productStoreSurveyAppls =
workEffortSurveyAppl.getRelated("ProductStoreSurveyAppl")>
<#list productStoreSurveyAppls as productStoreSurveyAppl>
<#if productStoreSurveyAppl?has_content>
- <#assign survey =
productStoreSurveyAppl.getRelatedOne("Survey")>
+ <#assign survey =
productStoreSurveyAppl.getRelatedOne("Survey", false)>
<tr>
<form method="post"
action="<@ofbizUrl>updateWorkEffortSurveyAppl</@ofbizUrl>"
name="editWorkEffortSurveyAppl_${workEffortSurveyAppl_index}">
<td><a
href="/content/control/EditSurvey?surveyId=${workEffortSurveyAppl.surveyId?if_exists}"
class="buttontext">${workEffortSurveyAppl.surveyId?if_exists} -
${survey.surveyName?if_exists}</a></td>
