You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by mr...@apache.org on 2009/02/01 22:40:35 UTC
svn commit: r739849 - in /ofbiz/trunk: applications/product/widget/facility/
specialpurpose/cmssite/widget/ specialpurpose/projectmgr/widget/forms/
Author: mrisaliti
Date: Sun Feb 1 21:40:35 2009
New Revision: 739849
URL: http://svn.apache.org/viewvc?rev=739849&view=rev
Log:
Artifact cleaning on various components after recent changes on xsd files (OFBIZ-2137)
Modified:
ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml
ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityGroupScreens.xml Sun Feb 1 21:40:35 2009
@@ -123,7 +123,7 @@
<set field="tabButtonItem" value="EditFacilityGroupMembers"/>
<entity-one entity-name="FacilityGroup" value-field="facilityGroup"/>
<set field="orderByList[]" value="sequenceNum"/>
- <get-related value-name="facilityGroup" relation-name="FacilityGroupMember" list-name="facilityGroupMembers" order-by-list-name="orderByList"/>
+ <get-related value-field="facilityGroup" relation-name="FacilityGroupMember" list="facilityGroupMembers" order-by-list="orderByList"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
@@ -148,7 +148,7 @@
<set field="headerItem" value="facilityGroup"/>
<set field="tabButtonItem" value="EditFacilityGroupRoles"/>
<entity-one entity-name="FacilityGroup" value-field="facilityGroup"/>
- <get-related value-name="facilityGroup" relation-name="FacilityGroupRole" list-name="facilityRoles"/>
+ <get-related value-field="facilityGroup" relation-name="FacilityGroupRole" list="facilityRoles"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityGroupDecorator">
@@ -173,8 +173,8 @@
<set field="parameters.facilityGroupId" from-field="parameters.showFacilityGroupId" default-value="${parameters.facilityGroupId}"/>
<entity-one entity-name="FacilityGroup" value-field="facilityGroup"/>
- <get-related relation-name="ParentFacilityGroupRollup" value-name="facilityGroup" list-name="parentGroupRollups"/>
- <get-related relation-name="CurrentFacilityGroupRollup" value-name="facilityGroup" list-name="currentGroupRollups"/>
+ <get-related relation-name="ParentFacilityGroupRollup" value-field="facilityGroup" list="parentGroupRollups"/>
+ <get-related relation-name="CurrentFacilityGroupRollup" value-field="facilityGroup" list="currentGroupRollups"/>
<set field="facilityGroupId" from-field="facilityGroup.facilityGroupId"/>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Sun Feb 1 21:40:35 2009
@@ -709,7 +709,7 @@
<set field="facilityGroupId" from-field="parameters.facilityGroupId"/>
<set field="orderByList[]" value="sequenceNum"/>
<entity-one entity-name="Facility" value-field="facility"/>
- <get-related value-name="facility" relation-name="FacilityGroupMember" list-name="facilityGroupMembers" order-by-list-name="orderByList"/>
+ <get-related value-field="facility" relation-name="FacilityGroupMember" list="facilityGroupMembers" order-by-list="orderByList"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"/>
<set field="title" value="${uiLabelMap.PageTitleEditFacilityGroups}"/>
</actions>
@@ -741,7 +741,7 @@
<set field="roleTypeId" from-field="parameters.roleTypeId"/>
<set field="orderByList[]" value="partyId"/>
<entity-one entity-name="Facility" value-field="facility"/>
- <get-related value-name="facility" relation-name="FacilityParty" list-name="facilityParties" order-by-list-name="orderByList"/>
+ <get-related value-field="facility" relation-name="FacilityParty" list="facilityParties" order-by-list="orderByList"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap"/>
<set field="title" value="${uiLabelMap.PageTitleEditFacilityParties}"/>
</actions>
@@ -831,7 +831,7 @@
<entity-one entity-name="InventoryItem" value-field="inventoryItem" auto-field-map="true"/>
<entity-condition entity-name="OrderItemShipGrpInvRes" list="inventoryItemReservations">
<condition-list combine="and">
- <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+ <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItemId"/>
</condition-list>
<order-by field-name="reservedDatetime"/>
</entity-condition>
@@ -918,7 +918,7 @@
<entity-condition entity-name="InventoryItemDetail" list="inventoryItemDetails">
<condition-list combine="and">
- <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+ <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItemId"/>
</condition-list>
<order-by field-name="-inventoryItemDetailSeqId"/>
</entity-condition>
@@ -973,7 +973,7 @@
<entity-condition entity-name="InventoryItemLabelAppl" list="inventoryItemLabelAppls">
<condition-list combine="and">
- <condition-expr field-name="inventoryItemId" operator="equals" env-name="inventoryItemId"/>
+ <condition-expr field-name="inventoryItemId" operator="equals" from-field="inventoryItemId"/>
</condition-list>
<order-by field-name="sequenceNum"/>
</entity-condition>
@@ -1115,7 +1115,7 @@
<entity-condition entity-name="Picklist" list="picklistActiveList">
<condition-list combine="and">
- <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PACKED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
@@ -1151,7 +1151,7 @@
</entity-condition>
<entity-condition entity-name="Picklist" list="picklistActiveList">
<condition-list combine="and">
- <condition-expr field-name="facilityId" operator="equals" env-name="parameters.facilityId"/>
+ <condition-expr field-name="facilityId" operator="equals" from-field="parameters.facilityId"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PICKED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_PACKED"/>
<condition-expr field-name="statusId" operator="not-equals" value="PICKLIST_CANCELLED"/>
@@ -1287,7 +1287,7 @@
<!-- get ShipmentRouteSegmentDetails that are PACKED and not CONFIRMED with carrier -->
<entity-condition entity-name="ShipmentRouteSegmentDetail" list="shipmentRouteSegments">
<condition-list combine="and">
- <condition-expr field-name="originFacilityId" operator="equals" env-name="parameters.facilityId"/>
+ <condition-expr field-name="originFacilityId" operator="equals" from-field="parameters.facilityId"/>
<condition-expr field-name="statusId" operator="equals" value="SHIPMENT_PACKED"/>
<condition-expr field-name="carrierServiceStatusId" operator="equals" value="SHRSCS_NOT_STARTED"/>
</condition-list>
Modified: ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/facility/InventoryItemLabelScreens.xml Sun Feb 1 21:40:35 2009
@@ -27,7 +27,7 @@
<set field="titleProperty" value="PageTitleFindInventoryItemLabels"/>
<set field="headerItem" value="inventoryItemLabel"/>
<set field="tabButtonItem" value="FindInventoryItemLabels"/>
- <entity-condition entity-name="InventoryItemLabel" list-name="inventoryItemLabels"/>
+ <entity-condition entity-name="InventoryItemLabel" list="inventoryItemLabels"/>
</actions>
<widgets>
<decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}">
@@ -60,7 +60,7 @@
<set field="titleProperty" value="PageTitleEditInventoryItemLabelTypes"/>
<set field="headerItem" value="inventoryItemLabel"/>
<set field="tabButtonItem" value="EditInventoryItemLabelTypes"/>
- <entity-condition entity-name="InventoryItemLabelType" list-name="inventoryItemLabelTypes"/>
+ <entity-condition entity-name="InventoryItemLabelType" list="inventoryItemLabelTypes"/>
</actions>
<widgets>
<decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}">
@@ -143,8 +143,8 @@
<set field="tabButtonItem" value="FindInventoryItemLabels"/>
<set field="subTabButtonItem" value="EditInventoryItemLabelAppls"/>
<entity-one entity-name="InventoryItemLabel" value-field="inventoryItemLabel"/>
- <get-related value-name="inventoryItemLabel" relation-name="InventoryItemLabelAppl" list-name="inventoryItemLabelAppls"/>
- <get-related-one value-name="inventoryItemLabel" relation-name="InventoryItemLabelType" to-value-name="inventoryItemLabelType"/>
+ <get-related value-field="inventoryItemLabel" relation-name="InventoryItemLabelAppl" list="inventoryItemLabelAppls"/>
+ <get-related-one value-field="inventoryItemLabel" relation-name="InventoryItemLabelType" to-value-field="inventoryItemLabelType"/>
</actions>
<widgets>
<decorator-screen name="CommonInventoryItemLabelDecorator" location="${parameters.commonFacilityDecoratorLocation}">
Modified: ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/cmssite/widget/CmssiteScreens.xml Sun Feb 1 21:40:35 2009
@@ -62,7 +62,7 @@
<set field="blogContentId" value="BLOGROOTMADMAX"/>
<entity-condition entity-name="ContentAssocViewTo" use-cache="false" list="blogList">
<condition-list combine="and">
- <condition-expr field-name="contentIdStart" operator="equals" env-name="blogContentId"/>
+ <condition-expr field-name="contentIdStart" operator="equals" from-field="blogContentId"/>
<condition-expr field-name="caContentAssocTypeId" operator="equals" value="PUBLISH_LINK"/>
<condition-expr field-name="caThruDate" operator="equals" value=""/>
<condition-expr field-name="statusId" operator="equals" value="CTNT_PUBLISHED"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Sun Feb 1 21:40:35 2009
@@ -96,10 +96,10 @@
<actions>
<entity-condition entity-name="ProjectPhaseTaskAndTimeEntryTimeSheet" list="entryList">
<condition-list combine="and">
- <condition-expr field-name="projectId" operator="equals" env-name="parameters.projectId"/>
- <condition-expr field-name="invoiceId" operator="equals" env-name="nullField"/>
+ <condition-expr field-name="projectId" operator="equals" from-field="parameters.projectId"/>
+ <condition-expr field-name="invoiceId" operator="equals" from-field="nullField"/>
<condition-expr field-name="timesheetStatusId" operator="equals" value="TIMESHEET_COMPLETED"/>
- <condition-expr field-name="fromDate" operator="less" env-name="parameters.thruDate" ignore-if-empty="true"/>
+ <condition-expr field-name="fromDate" operator="less" from-field="parameters.thruDate" ignore-if-empty="true"/>
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
@@ -116,7 +116,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="parameters.workEffortTypeId" value="PROJECT"/>
- <service service-name="performFind" result-map-list-name="listIt">
+ <service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="WorkEffort"/>
<field-map field-name="orderBy" value="lastStatusUpdate DESC"/>
@@ -345,7 +345,7 @@
<actions>
<entity-condition entity-name="WorkEffortPartyAssignView" list="assigns" distinct="true">
<condition-list combine="and">
- <condition-expr field-name="workEffortId" env-name="parameters.projectId" operator="equals"/>
+ <condition-expr field-name="workEffortId" from-field="parameters.projectId" operator="equals"/>
<condition-expr field-name="roleTypeId" value="PROVIDER%" operator="like"/>
</condition-list>
<select-field field-name="partyId"/>
@@ -416,7 +416,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignView" filter-by-date="true">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
@@ -444,7 +444,7 @@
<order-by field-name="groupName"/>
</entity-condition>
<entity-condition entity-name="WorkEffortPartyAssignView" filter-by-date="true" distinct="true" list="taskResources">
- <condition-expr field-name="workEffortId" env-name="projectId"/>
+ <condition-expr field-name="workEffortId" from-field="projectId"/>
<select-field field-name="partyId"/>
<select-field field-name="lastName"/>
<select-field field-name="firstName"/>
@@ -504,7 +504,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortNoteAndData">
- <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="noteId"/>
</entity-condition>
</actions>
@@ -632,12 +632,12 @@
</form>
<form name="AddProjectTimeToNewInvoice" target="addProjectTimeToNewInvoice" title="" type="single">
<actions>
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="assignOrg" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assignOrg" filter-by-date="true">
<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">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assignBilling" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.projectId"/>
<field-map field-name="roleTypeId" value="CLIENT_BILLING"/>
</entity-and>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/RequestForms.xml Sun Feb 1 21:40:35 2009
@@ -141,7 +141,7 @@
<form name="ListRequestsWorkEffortForm" type="list" use-row-submit="true" list-name="requests" paginate-target="requestlist"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="WorkEffortCustRequestView" list-name="requests">
+ <entity-and entity-name="WorkEffortCustRequestView" list="requests">
<field-map field-name="statusId" value="CRQ_REVIEWED"/>
<order-by field-name="createdDate"/>
</entity-and>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sun Feb 1 21:40:35 2009
@@ -149,7 +149,7 @@
<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="result" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="${entityName}"/>
<field-map field-name="orderBy" value="lastStatusUpdate DESC"/>
@@ -365,7 +365,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
- <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="timesheetId"/>
<order-by field-name="partyId"/>
<order-by field-name="rateTypeId"/>
@@ -436,7 +436,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortNoteAndData">
- <condition-expr field-name="workEffortId" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" from-field="workEffortId"/>
<order-by field-name="noteId"/>
</entity-condition>
</actions>
@@ -472,7 +472,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="WorkEffortPartyAssignment" filter-by-date="true">
- <condition-expr field-name="workEffortId" operator="equals" env-name="workEffortId"/>
+ <condition-expr field-name="workEffortId" operator="equals" from-field="workEffortId"/>
<order-by field-name="roleTypeId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=739849&r1=739848&r2=739849&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Feb 1 21:40:35 2009
@@ -109,7 +109,7 @@
<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="result" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Timesheet"/>
<field-map field-name="orderBy" value="fromDate DESC"/>
@@ -217,7 +217,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<entity-condition entity-name="TimeEntry">
- <condition-expr field-name="timesheetId" env-name="timesheetId"/>
+ <condition-expr field-name="timesheetId" from-field="timesheetId"/>
<order-by field-name="partyId"/>
<order-by field-name="rateTypeId"/>
<order-by field-name="-fromDate"/>