You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/02/01 14:54:10 UTC
svn commit: r739764 [3/3] - in /ofbiz/trunk:
applications/content/webapp/content/cms/
applications/content/webapp/content/layout/
applications/content/webapp/content/lookup/
applications/content/webapp/content/survey/ applications/content/widget/
appli...
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/TimeSheetScreens.xml Sun Feb 1 13:54:08 2009
@@ -273,7 +273,7 @@
<section>
<actions>
<entity-one entity-name="PartyNameView" value-field="partyNameView">
- <field-map field-name="partyId" env-name="timesheet.partyId"/>
+ <field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-one>
</actions>
<widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/WorkEffortTrees.xml Sun Feb 1 13:54:08 2009
@@ -33,7 +33,7 @@
</node>
<node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
<entity-one entity-name="WorkEffort" value-field="workEffort">
- <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
+ <field-map field-name="workEffortId" from-field="workEffortAssoc.workEffortIdTo"/>
</entity-one>
<include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/ProjectScreens.xml"/>
<sub-node node-name="node-list">
@@ -56,7 +56,7 @@
</node>
<node name="node-list" entry-name="workEffortAssoc" entity-name="WorkEffortAssoc" join-field-name="workEffortIdFrom" render-style="expand-collapse">
<entity-one entity-name="WorkEffort" value-field="workEffort">
- <field-map field-name="workEffortId" env-name="workEffortAssoc.workEffortIdTo"/>
+ <field-map field-name="workEffortId" from-field="workEffortAssoc.workEffortIdTo"/>
</entity-one>
<include-screen name="WorkEffortTreeLine" location="component://projectmgr/widget/TaskScreens.xml"/>
<sub-node node-name="node-list">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Feb 1 13:54:08 2009
@@ -23,7 +23,7 @@
header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="PartyGroup" value-field="partyGroup">
- <field-map field-name="partyId" env-name="partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-one>
</actions>
<alt-target use-when="project==null" target="createProject"/>
@@ -117,13 +117,13 @@
<actions>
<set field="parameters.workEffortTypeId" value="PROJECT"/>
<service service-name="performFind" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="WorkEffort"/>
<field-map field-name="orderBy" value="lastStatusUpdate DESC"/>
</service>
</actions>
<row-actions>
- <service service-name="getProject" result-map-name="resultProject">
+ <service service-name="getProject" result-map="resultProject">
<field-map field-name="projectId" value="${workEffortId}"/>
</service>
</row-actions>
@@ -161,7 +161,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffort">
- <field-map field-name="workEffortParentId" env-name="projectId"/>
+ <field-map field-name="workEffortParentId" from-field="projectId"/>
<field-map field-name="workEffortTypeId" value="PROJECT"/>
</entity-and>
</actions>
@@ -204,7 +204,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="StatusItem" value-field="currentStatus">
- <field-map field-name="statusId" env-name="currentStatusId"/>
+ <field-map field-name="statusId" from-field="currentStatusId"/>
</entity-one>
</row-actions>
<field name="workEffortTypeId"><hidden/></field>
@@ -238,8 +238,8 @@
<form name="EditProjectTasks" target="updateProjectTaskOrPhase" title="" list-name="tasks" type="list" separate-columns="true"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
<set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
<set field="plannedHours" from-field="result.taskInfo.plannedHours"/>
@@ -274,7 +274,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
<entity-one entity-name="StatusItem" value-field="currentStatus">
- <field-map field-name="statusId" env-name="currentStatusId"/>
+ <field-map field-name="statusId" from-field="currentStatusId"/>
</entity-one>
</row-actions>
<field name="workEffortTypeId"><hidden/></field>
@@ -360,9 +360,9 @@
</entity-condition>
</actions>
<row-actions>
- <service service-name="getProject" result-map-name="result">
- <field-map field-name="projectId" env-name="parameters.projectId"/>
- <field-map field-name="partyId" env-name="partyId"/>
+ <service service-name="getProject" result-map="result">
+ <field-map field-name="projectId" from-field="parameters.projectId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</service>
</row-actions>
<field name="projectId"><hidden/></field>
@@ -514,11 +514,11 @@
<form name="listResourcesTasks" type="list" list-name="tasks" paginate-target="listResourcesTask" target="updateResourcesTaskAssigment"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectIdAndNameFromTask" result-map="resultProject">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
<set field="currentStatusId" from-field="result.taskInfo.currentStatusId"/>
<set field="plannedHours" from-field="result.taskInfo.plannedHours"/>
@@ -548,8 +548,8 @@
<form name="listResourcesProjects" type="list" list-name="parties"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProject" result-map-name="result">
- <field-map field-name="projectId" env-name="workEffortId"/>
+ <service service-name="getProject" result-map="result">
+ <field-map field-name="projectId" from-field="workEffortId"/>
</service>
<set field="currentStatusId" from-field="result.projectInfo.currentStatusId"/>
<set field="Priority" from-field="result.projectInfo.priority"/>
@@ -633,12 +633,12 @@
<form name="AddProjectTimeToNewInvoice" target="addProjectTimeToNewInvoice" title="" type="single">
<actions>
<entity-and entity-name="WorkEffortPartyAssignment" list-name="assignOrg" filter-by-date="true">
- <field-map field-name="workEffortId" env-name="parameters.projectId"/>
+ <field-map field-name="workEffortId" from-field="parameters.projectId"/>
<field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
</entity-and>
<set field="partyIdFrom" value="${assignOrg[0].partyId}"/>
<entity-and entity-name="WorkEffortPartyAssignment" list-name="assignBilling" filter-by-date="true">
- <field-map field-name="workEffortId" env-name="parameters.projectId"/>
+ <field-map field-name="workEffortId" from-field="parameters.projectId"/>
<field-map field-name="roleTypeId" value="CLIENT_BILLING"/>
</entity-and>
<set field="partyId" value="${assignBilling[0].partyId}"/>
@@ -682,10 +682,10 @@
<set field="projectId" from-field="parameters.projectId" default-value="${parameters.workEffortId}"/>
<set field="workEffortId" from-field="parameters.workEffortId"/>
<entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
- <field-map field-name="statusId" env-name="content.statusId"/>
+ <field-map field-name="statusId" from-field="content.statusId"/>
</entity-one>
<entity-one entity-name="DataResource" value-field="dataResource" auto-field-map="false">
- <field-map field-name="dataResourceId" env-name="content.dataResourceId"/>
+ <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
</entity-one>
</actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Sun Feb 1 13:54:08 2009
@@ -93,10 +93,10 @@
header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="WorkEffort" value-field="workEffort">
- <field-map field-name="workEffortId" env-name="workEffortId"/>
+ <field-map field-name="workEffortId" from-field="workEffortId"/>
</entity-one>
- <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectIdAndNameFromTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
<set field="projectId" from-field="result.projectId"/>
<set field="projectName" from-field="result.projectName"/>
@@ -125,12 +125,12 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="CustRequestParty">
- <field-map field-name="custRequestId" env-name="custRequestId"/>
+ <field-map field-name="custRequestId" from-field="custRequestId"/>
</entity-and>
</actions>
<row-actions>
<entity-one entity-name="Person" value-field="person">
- <field-map field-name="partyId" env-name="partyId"/>
+ <field-map field-name="partyId" from-field="partyId"/>
</entity-one>
</row-actions>
<field name="partyId" widget-style="buttontext">
@@ -147,8 +147,8 @@
</entity-and>
</actions>
<row-actions>
- <service service-name="getProjectIdAndNameFromTask" result-map-name="sResult">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectIdAndNameFromTask" result-map="sResult">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
</row-actions>
<field name="custRequestId">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ResourceForms.xml Sun Feb 1 13:54:08 2009
@@ -27,8 +27,8 @@
<form name="ListResources" type="list" list-name="resources" paginate-target="FindResource"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getPartyEmail" result-map-name="emailResult"/>
- <service service-name="getPartyTelephone" result-map-name="telResult"/>
+ <service service-name="getPartyEmail" result-map="emailResult"/>
+ <service service-name="getPartyTelephone" result-map="telResult"/>
</row-actions>
<field name="resourceName" parameter-name="partyId" title="${uiLabelMap.ProjectMgrResourceName}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${lastName}, ${firstName} ${middleName} ${groupName}" target="viewprofile?partyId=${partyId}"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Feb 1 13:54:08 2009
@@ -149,16 +149,16 @@
<form name="ListTasks" type="list" separate-columns="true" title="Task List" list-name="listIt" paginate-target="FindTask"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="${entityName}"/>
<field-map field-name="orderBy" value="lastStatusUpdate DESC"/>
</service>
</actions>
<row-actions>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
- <field-map field-name="hoursPartyId" env-name="partyId"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
+ <field-map field-name="hoursPartyId" from-field="partyId"/>
</service>
<set field="plannedHours" from-field="result.taskInfo.plannedHours"/>
<set field="actualHours" from-field="result.taskInfo.actualTotalHours"/>
@@ -183,12 +183,12 @@
<form name="MyTasks" type="list" list-name="tasks" paginate-target="MyTasks" target="updateTaskAssigment"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
- <field-map field-name="hoursPartyId" env-name="userLogin.partyId"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
+ <field-map field-name="hoursPartyId" from-field="userLogin.partyId"/>
</service>
- <service service-name="getProjectIdAndNameFromTask" result-map-name="resultProject">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectIdAndNameFromTask" result-map="resultProject">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
</row-actions>
<field name="fromDate"><hidden/></field>
@@ -265,8 +265,8 @@
<form name="DependenciesBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="r">
- <field-map field-name="taskId" env-name="workEffortIdFrom"/>
+ <service service-name="getProjectTask" result-map="r">
+ <field-map field-name="taskId" from-field="workEffortIdFrom"/>
</service>
</row-actions>
<field name="workEffortIdTo"><hidden/></field>
@@ -285,8 +285,8 @@
<form name="DependenciesAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="Dependencies"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="r">
- <field-map field-name="taskId" env-name="workEffortIdTo"/>
+ <service service-name="getProjectTask" result-map="r">
+ <field-map field-name="taskId" from-field="workEffortIdTo"/>
</service>
</row-actions>
<field name="workEffortIdFrom"><hidden/></field>
@@ -507,7 +507,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-and entity-name="WorkEffortAndContentDataResource">
- <field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
+ <field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
</actions>
<field name="contentName" widget-style="smallSubmit">
@@ -534,8 +534,8 @@
<form name="TaskBefore" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortIdFrom"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortIdFrom"/>
</service>
<set field="task" from-field="result.taskInfo"/>
<set field="currentStatusId" from-field="task.currentStatusId"/>
@@ -557,8 +557,8 @@
<form name="TaskAfter" target="removeDependency" title="" list-name="depList" type="list" separate-columns="true" paginate-target="taskView"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortIdTo"/>
+ <service service-name="getProjectTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortIdTo"/>
</service>
<set field="task" from-field="result.taskInfo"/>
<set field="currentStatusId" from-field="task.currentStatusId"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=739764&r1=739763&r2=739764&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Feb 1 13:54:08 2009
@@ -22,8 +22,8 @@
<form name="EditWeekTimesheet" type="multi" list-name="timeEntries" use-row-submit="true"
separate-columns="true" target="update${my}Timesheet" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<row-actions>
- <service service-name="getProjectIdAndNameFromTask" result-map-name="result">
- <field-map field-name="taskId" env-name="workEffortId"/>
+ <service service-name="getProjectIdAndNameFromTask" result-map="result">
+ <field-map field-name="taskId" from-field="workEffortId"/>
</service>
</row-actions>
<field name="timesheetId"><hidden/></field>
@@ -109,8 +109,8 @@
<form name="ListFindTimeSheet" type="list" list-name="listIt" paginate-target="FindTimeSheet"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map-name="result" result-map-list-name="listIt">
- <field-map field-name="inputFields" env-name="parameters"/>
+ <service service-name="performFind" result-map="result" result-map-list-name="listIt">
+ <field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Timesheet"/>
<field-map field-name="orderBy" value="fromDate DESC"/>
</service>
@@ -189,7 +189,7 @@
header-row-style="header-row" default-table-style="basic-table">
<actions>
<entity-one entity-name="WorkEffort">
- <field-map field-name="workEffortId" env-name=""/>
+ <field-map field-name="workEffortId" from-field=""/>
</entity-one>
</actions>
<field name="timesheetId" map-name="currentTimesheet"><hidden/></field>