svn commit: r1351866 [48/48] - in /ofbiz/branches/20120329_portl
Locked
svn commit: r1351866 [48/48] - in /ofbiz/branches/20120329_portl
 
|
Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/ofbiz-component.xml Tue Jun 19 21:36:11 2012 @@ -29,7 +29,7 @@ under the License. <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrHelpData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrSecurityData.xml"/> + <entity-resource type="data" reader-name="security" loader="main" location="data/ProjectMgrSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProjectMgrPortletData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProjectMgrDemoPasswordData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/src/org/ofbiz/project/Various.java Tue Jun 19 21:36:11 2012 @@ -36,10 +36,10 @@ 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"); + 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 @@ -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/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy Tue Jun 19 21:36:11 2012 @@ -82,9 +82,9 @@ 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"); + 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) { @@ -101,7 +101,7 @@ void retrieveWorkEffortData() { } entry.actualHours = aHours; // get party assignment data to be able to set the task to complete - workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelatedByAnd("WorkEffortPartyAssignment", ["partyId" : partyId])); + workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelated("WorkEffortPartyAssignment", ["partyId" : partyId], null, false)); if (workEffortPartyAssigns) { workEffortPartyAssign = workEffortPartyAssigns[0]; entry.fromDate = workEffortPartyAssign.getTimestamp("fromDate"); @@ -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/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/ProjectBilling.groovy Tue Jun 19 21:36:11 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/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/WEB-INF/actions/getLastRequestAssignment.groovy Tue Jun 19 21:36:11 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"); // 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"); + partyList = custReqTask.getRelated("WorkEffortPartyAssignment", null, null, false); if (partyList) { context.childWorkEffortId = projectChildWorkEffort.workEffortId; context.partyId= partyList.get(0).partyId; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl Tue Jun 19 21:36:11 2012 @@ -35,10 +35,10 @@ 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")> + <#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> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/ofbiz-component.xml Tue Jun 19 21:36:11 2012 @@ -35,7 +35,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> <!-- <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> --> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumTypeData.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumSecurityData.xml"/> + <entity-resource type="data" reader-name="security" loader="main" location="data/scrumSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/scrumHelpData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/scrumDemoData.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumEvents.java Tue Jun 19 21:36:11 2012 @@ -83,7 +83,7 @@ public class ScrumEvents { //compare week and compare date if ((timesheetDate.compareTo(weekStart) <= 0) && (realTimeDate.compareTo(nowStartDate) < 0)) { //check time entry - List<GenericValue> timeEntryList = timesheetMap.getRelatedByAnd("TimeEntry", UtilMisc.toMap("partyId", partyId, "timesheetId",timesheetId, "fromDate",realTimeDate)); + List<GenericValue> timeEntryList = timesheetMap.getRelated("TimeEntry", UtilMisc.toMap("partyId", partyId, "timesheetId",timesheetId, "fromDate",realTimeDate), null, false); //check EmplLeave List<GenericValue> emplLeaveList = delegator.findByAnd("EmplLeave", UtilMisc.toMap("partyId", partyId, "fromDate", realTimeDate), null, true); if (UtilValidate.isEmpty(timeEntryList) && UtilValidate.isEmpty(emplLeaveList)) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/BacklogNotifications.groovy Tue Jun 19 21:36:11 2012 @@ -57,7 +57,7 @@ if (backlogList) { // check backlog removed from sprint. removedFromSprint = false; if ("CRQ_ACCEPTED".equals(custRequest.statusId)) { - custStatusList = custRequest.getRelated("CustRequestStatus", ["-custRequestStatusId"]); + custStatusList = custRequest.getRelated("CustRequestStatus", null, ["-custRequestStatusId"], false); if (custStatusList.size() > 2 && "CRQ_REVIEWED".equals(custStatusList[1].statusId)) { removedFromSprint = true; } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditDailyHourReport.groovy Tue Jun 19 21:36:11 2012 @@ -90,9 +90,9 @@ lastEmplLeaveEntry = 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"); + plannedHours = entryWorkEffort.getRelated("WorkEffortSkillStandard", null, null, false); pHours = 0.00; plannedHours.each { plannedHour -> if (plannedHour.estimatedDuration) { @@ -114,7 +114,7 @@ void retrieveWorkEffortData() { planHours = estimatedHour; } entry.planHours = lastTimeEntry.planHours; - actualHours = entryWorkEffort.getRelated("TimeEntry"); + actualHours = entryWorkEffort.getRelated("TimeEntry", null, null, false); aHours = 0.00; actualHours.each { actualHour -> if (actualHour.hours) { @@ -123,7 +123,7 @@ void retrieveWorkEffortData() { } entry.actualHours = aHours; // get party assignment data to be able to set the task to complete - workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelatedByAnd("WorkEffortPartyAssignment", ["partyId" : partyId])); + workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelated("WorkEffortPartyAssignment", ["partyId" : partyId], null, false)); if (workEffortPartyAssigns) { workEffortPartyAssign = workEffortPartyAssigns[0]; entry.fromDate = workEffortPartyAssign.getTimestamp("fromDate"); @@ -164,7 +164,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 @@ -378,7 +378,7 @@ timesheetsDb.each { timesheetDb -> //get hours from TimeEntry; timesheet = [:]; timesheet.putAll(timesheetDb); - entries = timesheetDb.getRelated("TimeEntry"); + entries = timesheetDb.getRelated("TimeEntry", null, null, false); hours = 0.00; entries.each { timeEntry -> if (timeEntry.hours) { @@ -430,7 +430,7 @@ if (backlogIndexList) { custRequestList = delegator.findByAnd("CustRequest", ["custRequestTypeId" : "RF_UNPLAN_BACKLOG","statusId" : "CRQ_REVIEWED"],["custRequestDate DESC"], false); if (custRequestList) { custRequestList.each { custRequestMap -> - custRequestItemList = custRequestMap.getRelated("CustRequestItem"); + custRequestItemList = custRequestMap.getRelated("CustRequestItem", null, null, false); custRequestItem = productOut = custRequestItemList[0].productId; product = delegator.findOne("Product", ["productId" : productOut], false); Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/EditWeekTimesheet.groovy Tue Jun 19 21:36:11 2012 @@ -82,9 +82,9 @@ 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"); + 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) { @@ -101,7 +101,7 @@ void retrieveWorkEffortData() { } entry.actualHours = aHours; // get party assignment data to be able to set the task to complete - workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelatedByAnd("WorkEffortPartyAssignment", ["partyId" : partyId])); + workEffortPartyAssigns = EntityUtil.filterByDate(entryWorkEffort.getRelated("WorkEffortPartyAssignment", ["partyId" : partyId], null, false)); if (workEffortPartyAssigns) { workEffortPartyAssign = workEffortPartyAssigns[0]; entry.fromDate = workEffortPartyAssign.getTimestamp("fromDate"); @@ -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/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ListTimeSheets.groovy Tue Jun 19 21:36:11 2012 @@ -66,7 +66,7 @@ if (performFindResults.listSize > 0) { //get hours from TimeEntry; 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/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/ProductBilling.groovy Tue Jun 19 21:36:11 2012 @@ -35,7 +35,7 @@ orderBy = ["-fromDate"]; // check if latest invoice generated is still in process so allow re-generation to correct errors entryIterator = delegator.find("ProjectSprintBacklogTaskAndTimeEntryTimeSheet", 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/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogListItems.groovy Tue Jun 19 21:36:11 2012 @@ -81,7 +81,7 @@ if (parameters.sprintId) { allTask = []; sprintList = delegator.findByAnd("CustRequestWorkEffort", ["workEffortId" : parameters.sprintId], null, false); sprintList.each { sprintMap -> - custMap = sprintMap.getRelatedOne("CustRequest"); + custMap = sprintMap.getRelatedOne("CustRequest", false); //if ("RF_PROD_BACKLOG".equals(custMap.custRequestTypeId)) { totalbacklog += 1; if ("CRQ_REVIEWED".equals(custMap.statusId)){ @@ -90,7 +90,7 @@ if (parameters.sprintId) { completedBacklog += 1; } //get task - workEffortList = custMap.getRelated("CustRequestWorkEffort"); + workEffortList = custMap.getRelated("CustRequestWorkEffort", null, null, false); if (workEffortList) { allTask.addAll(workEffortList); } @@ -102,7 +102,7 @@ if (parameters.sprintId) { totalTask = 0; if (allTask) { allTask.each { taskMap -> - workEffMap = taskMap.getRelatedOne("WorkEffort"); + workEffMap = taskMap.getRelatedOne("WorkEffort", false); if (!"SCRUM_SPRINT".equals(workEffMap.workEffortTypeId)) { totalTask += 1; if ("STS_CREATED".equals(workEffMap.currentStatusId)){ Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/WEB-INF/actions/SprintBacklogOptions.groovy Tue Jun 19 21:36:11 2012 @@ -22,10 +22,10 @@ import org.ofbiz.base.util.Debug; custRequestWorkEffortList = []; sprintStatusId = "SPRINT_CLOSED"; sprintId = null; -custRequestWorkEffortList = custRequestMap.getRelated("CustRequestWorkEffort"); +custRequestWorkEffortList = custRequestMap.getRelated("CustRequestWorkEffort", null, null, false); if (custRequestWorkEffortList) { custRequestWorkEffortList.each { custWorkEffortMap -> - workEffortMap = custWorkEffortMap.getRelatedOne("WorkEffort"); + workEffortMap = custWorkEffortMap.getRelatedOne("WorkEffort", false); if ("SCRUM_SPRINT".equals(workEffortMap.workEffortTypeId) && "SPRINT_ACTIVE".equals(workEffortMap.currentStatusId)) { sprintId = workEffortMap.workEffortId; sprintStatusId = "SPRINT_ACTIVE"; Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/webapp/scrum/reports/Burndown.rptdesign Tue Jun 19 21:36:11 2012 @@ -274,7 +274,7 @@ var actualHours = BigDecimal.ZERO; // get times from all backlog item's tasks var sprint = delegator.findOne("WorkEffort", UtilMisc.toMap("workEffortId", sprintId), false); -var backlogItems = sprint.getRelated("CustRequestWorkEffort"); +var backlogItems = sprint.getRelated("CustRequestWorkEffort", null, null, false); for (i=0; i<backlogItems.size(); i++) { // get all task from backlog item var backlogItem = backlogItems.get(i); Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/scrum/widget/scrumForms.xml Tue Jun 19 21:36:11 2012 @@ -177,12 +177,12 @@ under the License. </field> <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!"STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> <field name="taskCurrentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when=""STS_COMPLETED".equals(taskCurrentStatusId)&&!"SCRUM_SPRINT".equals(taskTypeId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> - <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy2" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy3" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field> <field name="initialPlannedHours" title="Initial Plan / Total Plan" position="1" use-when="showPosition1"><display description="${initialPlannedHours} / ${backlogPlanHours}"/></field> - <field name="dummy4" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy5" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy4" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy5" title=" " position="1" use-when="showPosition1"><display description=" "/></field> <field name="taskActualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display/></field> <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display></display> </field> @@ -200,7 +200,7 @@ under the License. <parameter param-name="projectId"/> </hyperlink> </field> - <field name="dummy6" title="${uiLabelMap.CommonEmptyHeader}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display description=" "/></field> + <field name="dummy6" title=" " position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display description=" "/></field> <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" position="2" parameter-name="partyId" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"> <display-entity entity-name="PartyNameView" description="${lastName}, ${firstName} ${middleName}" key-field-name="partyId"/> </field> @@ -225,7 +225,7 @@ under the License. <parameter param-name="sprintId"></parameter> </hyperlink> </field> - <field name="dummy7" title="${uiLabelMap.CommonEmptyHeader}" position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display description=" "/></field> + <field name="dummy7" title=" " position="2" use-when="!"SCRUM_SPRINT".equals(taskTypeId)"><display description=" "/></field> </form> <form name="sprintBacklogListItemsHideDelete" extends="sprintBacklogListItems"> @@ -934,7 +934,7 @@ under the License. <display-entity entity-name="CustRequest" key-field-name="custRequestId" description="${custRequestName}"/> </field> <!-- order button --> - <field name="top" position="2" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="top" position="2" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-end-up-green.png"> <parameter param-name="mode" value="TOP"/> <parameter param-name="custRequestId"/> @@ -955,7 +955,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="bot" position="2" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="bot" position="2" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-end-down-green.png"> <parameter param-name="mode" value="BOT"/> <parameter param-name="custRequestId"/> @@ -976,7 +976,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="up" position="2" title="${uiLabelMap.CommonEmptyHeader}" > + <field name="up" position="2" title=" " > <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-single-up-green.png"> <parameter param-name="mode" value="UP"/> <parameter param-name="custRequestId"/> @@ -997,7 +997,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="dwn" position="2" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="dwn" position="2" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-single-down-green.png"> <parameter param-name="mode" value="DWN"/> <parameter param-name="custRequestId"/> @@ -1051,7 +1051,7 @@ under the License. <field name="sequence"><hidden value="Y"/></field> <field name="custRequestCategoryGroupId"><hidden/></field> <!-- order button --> - <field name="top" position="1" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="top" position="1" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-end-up-green.png"> <parameter param-name="mode" value="TOP"/> <parameter param-name="custRequestId"/> @@ -1071,7 +1071,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="bot" position="1" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="bot" position="1" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-end-down-green.png"> <parameter param-name="mode" value="BOT"/> <parameter param-name="custRequestId"/> @@ -1091,7 +1091,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="up" position="1" title="${uiLabelMap.CommonEmptyHeader}" > + <field name="up" position="1" title=" " > <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-single-up-green.png"> <parameter param-name="mode" value="UP"/> <parameter param-name="custRequestId"/> @@ -1111,7 +1111,7 @@ under the License. <parameter param-name="searchOption_statusId" value="${parameters.statusId}"/> </hyperlink> </field> - <field name="dwn" position="1" title="${uiLabelMap.CommonEmptyHeader}"> + <field name="dwn" position="1" title=" "> <hyperlink target="updateSprintBacklogseq" image-location="/images/arrow-single-down-green.png"> <parameter param-name="mode" value="DWN"/> <parameter param-name="custRequestId"/> @@ -1247,7 +1247,7 @@ under the License. <parameter param-name="partyId" from-field="productOwnerId"/> </hyperlink> </field> - <field name="dummy" title="${uiLabelMap.CommonEmptyHeader}" position="2" use-when=""${sprintId}"!="""><display description=" "/></field> + <field name="dummy" title=" " position="2" use-when=""${sprintId}"!="""><display description=" "/></field> <field name="sprintName" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumSprint}" position="2" use-when=""${sprintId}"!="""> <hyperlink target="ViewSprint" description="${uiLabelMap.ScrumTab} ${sprintName} [${sprintId}]"> <parameter param-name="projectId"/> @@ -1843,15 +1843,15 @@ under the License. <option key="N" description="${uiLabelMap.CommonN}"/> </drop-down> </field> - <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> - <field name="dummy2" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> - <field name="dummy3" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> + <field name="dummy1" title=" " position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> + <field name="dummy2" title=" " position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> + <field name="dummy3" title=" " position="1" use-when="${groovy:showPosition1==true}"><display description=" "/></field> <field name="taskId" position="2" title="${uiLabelMap.ScrumTab} ${uiLabelMap.ScrumTaskName}"> <display-entity entity-name="WorkEffort" key-field-name="workEffortId" description="${uiLabelMap.ScrumTab} ${workEffortName}"/> </field> <field name="hours" position="2"><display/></field> <field name="timesheetPartyId" position="2"><display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName}" key-field-name="partyId"/></field> - <field name="dummy4" title="${uiLabelMap.CommonEmptyHeader}" position="2" ><display description=" "/></field> + <field name="dummy4" title=" " position="2" ><display description=" "/></field> <field name="timesheetId" position="2"> <hyperlink description="${timesheetId}" target="ViewTimeSheet"> <parameter param-name="timesheetId"/> @@ -3058,12 +3058,12 @@ under the License. </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="!"STS_COMPLETED".equals(currentStatusId)"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}" position="2" use-when=""STS_COMPLETED".equals(currentStatusId)" widget-style="alert"><display-entity entity-name="StatusItem" description="${description}" key-field-name="statusId"/></field> - <field name="dummy1" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy2" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy3" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy1" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy2" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy3" title=" " position="1" use-when="showPosition1"><display description=" "/></field> <field name="initialPlannedHours" title="Initial Plan / Total Plan" position="1" use-when="showPosition1"><display description="${initialPlannedHours} / ${backlogPlanHours}"/></field> - <field name="dummy4" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> - <field name="dummy5" title="${uiLabelMap.CommonEmptyHeader}" position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy4" title=" " position="1" use-when="showPosition1"><display description=" "/></field> + <field name="dummy5" title=" " position="1" use-when="showPosition1"><display description=" "/></field> <field name="taskActualHours" title="${uiLabelMap.ScrumActualHours}" position="2" use-when="workEffortId!=null"><display/></field> <field name="planHours" title="${uiLabelMap.ScrumPlannedHours}" position="2" use-when="workEffortId!=null"> <display/> @@ -3081,7 +3081,7 @@ under the License. <parameter param-name="productId"/> </hyperlink> </field> - <field name="dummy6" title="${uiLabelMap.CommonEmptyHeader}" position="2" use-when="workEffortId!=null"><display description=" "/></field> + <field name="dummy6" title=" " position="2" use-when="workEffortId!=null"><display description=" "/></field> <field name="partyId" title="${uiLabelMap.ScrumAssignedTo}" position="2" use-when="workEffortId!=null" > <display description="${partyList[0].lastName} ${partyList[0].firstName} ${partyList[0].middleName}"></display> </field> @@ -3104,7 +3104,7 @@ under the License. <parameter param-name="productId" from-field="parameters.productId"/> </hyperlink> </field> - <field name="dummy7" title="${uiLabelMap.CommonEmptyHeader}" position="2" use-when="workEffortId!=null"><display description=" "/></field> + <field name="dummy7" title=" " position="2" use-when="workEffortId!=null"><display description=" "/></field> </form> <form name="unplanBacklogListItemsHideDelete" extends="unplanBacklogListItems"> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Tue Jun 19 21:36:11 2012 @@ -272,7 +272,7 @@ public class WebPosTransaction { List<GenericValue> fcp = null; try { - fcp = facility.getRelatedByAnd("FacilityContactMechPurpose", UtilMisc.toMap("contactMechPurposeTypeId", "SHIP_ORIG_LOCATION")); + fcp = facility.getRelated("FacilityContactMechPurpose", UtilMisc.toMap("contactMechPurposeTypeId", "SHIP_ORIG_LOCATION"), null, false); } catch (GenericEntityException e) { Debug.logError(e, module); } @@ -512,4 +512,4 @@ public class WebPosTransaction { public ShoppingCart getCart() { return webPosSession.getCart(); } -} \ No newline at end of file +} Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/customer/EditAddress.groovy Tue Jun 19 21:36:11 2012 @@ -26,7 +26,7 @@ if (person) { contactMech = delegator.findOne("ContactMech", [contactMechId : parameters.contactMechId], false); if (contactMech) { - postalAddress = contactMech.getRelatedOne("PostalAddress"); + postalAddress = contactMech.getRelatedOne("PostalAddress", false); if (postalAddress) { request.setAttribute("contactMechId", postalAddress.contactMechId); request.setAttribute("toName", postalAddress.toName); @@ -47,4 +47,4 @@ if (contactMech) { } } } -request.setAttribute("contactMechPurposeTypeId", parameters.contactMechPurposeTypeId); \ No newline at end of file +request.setAttribute("contactMechPurposeTypeId", parameters.contactMechPurposeTypeId); Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/WEB-INF/actions/search/CustomerAddress.groovy Tue Jun 19 21:36:11 2012 @@ -30,7 +30,7 @@ if (webPosSession) { if (UtilValidate.isNotEmpty(shippingContactMechId)) { contactMech = delegator.findOne("ContactMech", [contactMechId : shippingContactMechId], false); if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) { - context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress"); + context.shippingPostalAddress = contactMech.getRelatedOne("PostalAddress", false); } } billToCustomerPartyId = shoppingCart.getBillToCustomerPartyId(); @@ -41,7 +41,7 @@ if (webPosSession) { if (UtilValidate.isNotEmpty(billingContactMechId)) { contactMech = delegator.findOne("ContactMech", [contactMechId : billingContactMechId], false); if (UtilValidate.isNotEmpty(contactMech) && "POSTAL_ADDRESS".equals(contactMech.contactMechTypeId)) { - context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress"); + context.billingPostalAddress = contactMech.getRelatedOne("PostalAddress", false); } } -} \ No newline at end of file +} Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/catalog/CategoryDetail.ftl Tue Jun 19 21:36:11 2012 @@ -22,7 +22,7 @@ under the License. <#assign cell = 0/> <tr> <#list productCategoryMembers as productCategoryMember> - <#assign product = productCategoryMember.getRelatedOne("Product")?if_exists> + <#assign product = productCategoryMember.getRelatedOne("Product", false)?if_exists> <#if product?exists && product?has_content> <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(product, "SMALL_IMAGE_URL", locale, dispatcher)?if_exists /> <#if !smallImageUrl?string?has_content> @@ -65,4 +65,4 @@ under the License. <script language="JavaScript" type="text/javascript"> showSelectedButton(); </script> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl Tue Jun 19 21:36:11 2012 @@ -40,8 +40,8 @@ under the License. <td><b><#if personBillTo.lastName?has_content>${personBillTo.lastName}</#if> <#if personBillTo.firstName?has_content>${personBillTo.firstName}</#if></b></td> </tr> </#if> - <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/> - <#assign country = billingPostalAddress.getRelatedOne("CountryGeo")?if_exists/> + <#assign state = billingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/> + <#assign country = billingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/> <tr> <td><#if billingPostalAddress.address1?has_content>${billingPostalAddress.address1}</#if></td> </tr> @@ -71,8 +71,8 @@ under the License. <td><b><#if personShipTo.lastName?has_content>${personShipTo.lastName}</#if> <#if personShipTo.firstName?has_content>${personShipTo.firstName}</#if></b></td> </tr> </#if> - <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo")?if_exists/> - <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo")?if_exists/> + <#assign state = shippingPostalAddress.getRelatedOne("StateProvinceGeo", false)?if_exists/> + <#assign country = shippingPostalAddress.getRelatedOne("CountryGeo", false)?if_exists/> <tr> <td><#if shippingPostalAddress.address1?has_content>${shippingPostalAddress.address1}</#if></td> </tr> @@ -118,4 +118,4 @@ under the License. </div> <script language="JavaScript" type="text/javascript"> customerAddressSelected(); -</script> \ No newline at end of file +</script> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/ofbiz-component.xml Tue Jun 19 21:36:11 2012 @@ -28,7 +28,7 @@ under the License. <entity-resource type="model" reader-name="main" loader="main" location="entitydef/entitymodel.xml"/> - <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowSecurityData.xml"/> + <entity-resource type="data" reader-name="security" loader="main" location="data/WorkFlowSecurityData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/WorkFlowTypeData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/OrderProcessWorkflow.xml"/> Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfApplicationServices.java Tue Jun 19 21:36:11 2012 @@ -239,7 +239,7 @@ public class WfApplicationServices { try { GenericValue application = delegator.findOne("ApplicationSandbox", UtilMisc.toMap("applicationId", applicationId), false); - return application.getRelatedOne("RuntimeData"); + return application.getRelatedOne("RuntimeData", false); } catch (GenericEntityException ee) { throw new GenericServiceException(ee.getMessage(), ee); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/WfFactory.java Tue Jun 19 21:36:11 2012 @@ -41,8 +41,8 @@ public class WfFactory { public static final String module = WfFactory.class.getName(); - protected static UtilCache<String, WfProcessMgrImpl> wfProcessMgrCache = UtilCache.createUtilCache("workflow.processmgr"); - protected static UtilCache<DispatchContext, WorkflowClient> wfClientCache = UtilCache.createUtilCache("workflow.client"); + private static final UtilCache<String, WfProcessMgrImpl> wfProcessMgrCache = UtilCache.createUtilCache("workflow.processmgr"); + private static final UtilCache<DispatchContext, WorkflowClient> wfClientCache = UtilCache.createUtilCache("workflow.client"); /** * Creates a new {@link WfActivity} instance. @@ -137,14 +137,11 @@ public class WfFactory { if (pid == null) throw new WfException("Workflow process id cannot be null"); String key = delegator.getDelegatorName() + ":" + pkg + ":" + pkver + ":" + pid + ":" + pver; - if (!wfProcessMgrCache.containsKey(key)) { - synchronized (WfFactory.class) { - if (!wfProcessMgrCache.containsKey(key)) { - wfProcessMgrCache.put(key, new WfProcessMgrImpl(delegator, pkg, pkver, pid, pver)); - } - } + WfProcessMgrImpl wfProcessMgr = wfProcessMgrCache.get(key); + if (wfProcessMgr == null) { + wfProcessMgr = wfProcessMgrCache.putIfAbsentAndGet(key, new WfProcessMgrImpl(delegator, pkg, pkver, pid, pver)); } - return wfProcessMgrCache.get(key); + return wfProcessMgr; } /** @@ -194,13 +191,11 @@ public class WfFactory { } public static WorkflowClient getClient(DispatchContext dctx) { - if (!wfClientCache.containsKey(dctx)) { - synchronized (WfFactory.class) { - if (!wfClientCache.containsKey(dctx)) - wfClientCache.put(dctx, new WorkflowClient(dctx)); - } + WorkflowClient client = wfClientCache.get(dctx); + if (client == null) { + client = wfClientCache.putIfAbsentAndGet(dctx, new WorkflowClient(dctx)); } - return wfClientCache.get(dctx); + return client; } } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityImpl.java Tue Jun 19 21:36:11 2012 @@ -119,7 +119,7 @@ public class WfActivityImpl extends WfEx GenericValue performer = null; if (valueObject.get("performerParticipantId") != null) { try { - performer = valueObject.getRelatedOne("PerformerWorkflowParticipant"); + performer = valueObject.getRelatedOne("PerformerWorkflowParticipant", false); if (performer == null) { Map<String, Object> performerFields = UtilMisc.toMap("packageId", (Object) valueObject.getString("packageId"), "packageVersion", valueObject.getString("packageVersion"), "processId", "_NA_", @@ -170,7 +170,7 @@ public class WfActivityImpl extends WfEx Map<String, Object> fields1 = UtilMisc.toMap("partyId", (Object) performer.getString("partyId")); GenericValue v1 = getDelegator().findOne("Party", fields1, false); - partyType = v1.getRelatedOne("PartyType"); + partyType = v1.getRelatedOne("PartyType", false); Map<String, Object> fields2 = UtilMisc.toMap("partyTypeId", (Object) "PARTY_GROUP"); groupType = getDelegator().findOne("PartyType", fields2, true); } catch (GenericEntityException e) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivitySubFlowImplementation.java Tue Jun 19 21:36:11 2012 @@ -44,7 +44,7 @@ public class WfActivitySubFlowImplementa public void run() throws WfException { GenericValue subFlow = null; try { - subFlow = getActivity().getDefinitionObject().getRelatedOne("WorkflowActivitySubFlow"); + subFlow = getActivity().getDefinitionObject().getRelatedOne("WorkflowActivitySubFlow", false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfActivityToolImplementation.java Tue Jun 19 21:36:11 2012 @@ -50,7 +50,7 @@ public class WfActivityToolImplementatio List<GenericValue> tools = null; String allParams = ""; try { - tools = getActivity().getDefinitionObject().getRelated("WorkflowActivityTool"); + tools = getActivity().getDefinitionObject().getRelated("WorkflowActivityTool", null, null, false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfExecutionObjectImpl.java Tue Jun 19 21:36:11 2012 @@ -226,7 +226,7 @@ public abstract class WfExecutionObjectI String stateStr = null; try { - statusObj = getRuntimeObject().getRelatedOne("CurrentStatusItem"); + statusObj = getRuntimeObject().getRelatedOne("CurrentStatusItem", false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } @@ -568,7 +568,7 @@ public abstract class WfExecutionObjectI dataObject.set("runtimeDataId", seqId); dataObject.store(); } else { - runtimeData = dataObject.getRelatedOne("RuntimeData"); + runtimeData = dataObject.getRelatedOne("RuntimeData", false); } // String serialized = XmlSerializer.serialize(value); // System.out.println(serialized); @@ -603,7 +603,7 @@ public abstract class WfExecutionObjectI if (dataObject.get("runtimeDataId") == null) return context; try { - GenericValue runtimeData = dataObject.getRelatedOne("RuntimeData"); + GenericValue runtimeData = dataObject.getRelatedOne("RuntimeData", false); contextXML = runtimeData.getString("runtimeInfo"); } catch (GenericEntityException e) { Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/src/org/ofbiz/workflow/impl/WfProcessImpl.java Tue Jun 19 21:36:11 2012 @@ -159,7 +159,7 @@ public class WfProcessImpl extends WfExe } else { // this is either the first activity defined or specified as an ExtendedAttribute // since this is defined in XPDL, we don't care if canStart is set. - start = getDefinitionObject().getRelatedOne("DefaultStartWorkflowActivity"); + start = getDefinitionObject().getRelatedOne("DefaultStartWorkflowActivity", false); } } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e.getNested()); @@ -286,7 +286,7 @@ public class WfProcessImpl extends WfExe GenericValue toActivity = null; try { - toActivity = trans.getRelatedOne("ToWorkflowActivity"); + toActivity = trans.getRelatedOne("ToWorkflowActivity", false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } @@ -320,7 +320,7 @@ public class WfProcessImpl extends WfExe List<GenericValue> toTrans = null; try { - toTrans = toActivity.getRelated("ToWorkflowTransition"); + toTrans = toActivity.getRelated("ToWorkflowTransition", null, null, false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } @@ -410,7 +410,7 @@ public class WfProcessImpl extends WfExe // get the from transitions List<GenericValue> fromTransitions = null; try { - fromTransitions = fromActivity.getDefinitionObject().getRelated("FromWorkflowTransition"); + fromTransitions = fromActivity.getDefinitionObject().getRelated("FromWorkflowTransition", null, null, false); } catch (GenericEntityException e) { throw new WfException(e.getMessage(), e); } Modified: ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl?rev=1351866&r1=1351865&r2=1351866&view=diff ============================================================================== --- ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl (original) +++ ofbiz/branches/20120329_portletWidget/specialpurpose/workflow/webapp/workflow/workflow/workflowMonitor.ftl Tue Jun 19 21:36:11 2012 @@ -69,7 +69,7 @@ under the License. <td>${uiLabelMap.WorkflowWorkflowAssignments}</td> </tr> <#list activities as step> - <#assign assignments = step.getRelated("WorkEffortPartyAssignment")> + <#assign assignments = step.getRelated("WorkEffortPartyAssignment", null, null, false)> <#assign assignments = EntityUtil.filterByDate(assignments)> <tr> <#-- TODO: add external login ID to external links --> Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.bat ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.bat:r1340642-1346323 Propchange: ofbiz/branches/20120329_portletWidget/tools/mergefromtrunk.sh ------------------------------------------------------------------------------ Merged /ofbiz/trunk/tools/mergefromtrunk.sh:r1340642-1346323 |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |