You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/07/19 23:33:39 UTC
svn commit: r678222 - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/content/script/org/ofbiz/content/permission/
applications/ecommerce/script/org/ofbiz/ecommerce/customer/
applications/manufacturing/script/or...
Author: lektran
Date: Sat Jul 19 14:33:38 2008
New Revision: 678222
URL: http://svn.apache.org/viewvc?rev=678222&view=rev
Log:
Removed a whole pile of filter-list-by-date elements and used the filter-by-date attribute of entity-and instead
Modified:
ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
Modified: ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml (original)
+++ ofbiz/trunk/applications/accounting/script/org/ofbiz/accounting/admin/AcctgAdminServices.xml Sat Jul 19 14:33:38 2008
@@ -86,13 +86,12 @@
</else>
</if-not-empty>
- <entity-and entity-name="PartyRelationship" list-name="parentPartyRelationships">
+ <entity-and entity-name="PartyRelationship" list-name="parentPartyRelationships" filter-by-date="true">
<field-map field-name="partyIdTo" env-name="currentOrganizationPartyId"/>
<field-map field-name="partyRelationshipTypeId" value="GROUP_ROLLUP"/>
<field-map field-name="roleTypeIdFrom" value="_NA_"/>
<field-map field-name="roleTypeIdTo" value="_NA_"/>
</entity-and>
- <filter-list-by-date list-name="parentPartyRelationships"/>
<if-not-empty field="parentPartyRelationships">
<first-from-list list-name="parentPartyRelationships" entry-name="parentPartyRelationship"/>
@@ -121,11 +120,10 @@
</if-empty>
<!-- find the existing exchange rates for this currency pair -->
- <entity-and entity-name="UomConversionDated" list-name="uomConversions">
+ <entity-and entity-name="UomConversionDated" list-name="uomConversions" filter-by-date="true">
<field-map env-name="parameters.uomId" field-name="uomId"/>
<field-map env-name="parameters.uomIdTo" field-name="uomIdTo"/>
</entity-and>
- <filter-list-by-date list-name="uomConversions"/>
<!-- expire all of them -->
<iterate list-name="uomConversions" entry-name="uomConversion">
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/permission/ContentPermissionServices.xml Sat Jul 19 14:33:38 2008
@@ -783,10 +783,9 @@
</if-empty>
<check-errors/>
- <entity-and entity-name="ContentAssoc" list-name="assocs">
+ <entity-and entity-name="ContentAssoc" list-name="assocs" filter-by-date="true">
<field-map field-name="contentIdTo" env-name="contentId"/>
</entity-and>
- <filter-list-by-date list-name="assocs"/>
<field-to-result field-name="assocs" result-name="contentAssocList"/>
</simple-method>
</simple-methods>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sat Jul 19 14:33:38 2008
@@ -1155,21 +1155,19 @@
<set field="creditCardContext.partyId" from-field="partyId"/>
<set field="creditCardContext.userLogin" from-field="userLogin"/>
<if-empty field="parameters.billToContactMechId">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList">
+ <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
<field-map field-name="partyId" env-name="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
- <filter-list-by-date list-name="pcmpList"/>
<first-from-list list-name="pcmpList" entry-name="pcmp"/>
<if-not-empty field="pcmp">
<set-service-fields service-name="deletePartyContactMechPurposeIfExists" map-name="pcmp" to-map-name="deletePartyContactMechPurposeCtx"/>
<call-service service-name="deletePartyContactMechPurposeIfExists" in-map-name="deletePartyContactMechPurposeCtx"/>
</if-not-empty>
- <entity-and entity-name="PaymentMethod" list-name="paymentMethodList">
+ <entity-and entity-name="PaymentMethod" list-name="paymentMethodList" filter-by-date="true">
<field-map field-name="partyId" env-name="parameters.partyId"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <filter-list-by-date list-name="paymentMethodList"/>
<first-from-list list-name="paymentMethodList" entry-name="paymentMethod"/>
<set field="billToAddressAndCreditCardCtx.paymentMethodId" from-field="paymentMethod.paymentMethodId"/>
<!-- Create Credit Card and Address -->
@@ -1185,11 +1183,10 @@
<result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
<result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>
</call-service>
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList">
+ <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
<field-map field-name="partyId" env-name="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
- <filter-list-by-date list-name="pcmpList"/>
<first-from-list list-name="pcmpList" entry-name="pcmp"/>
<if-compare-field field="parameters.billToContactMechId" operator="not-equals" to-field="pcmp.contactMechId">
<if-not-empty field="pcmp">
@@ -1206,11 +1203,10 @@
</if-compare>
<if-compare field="parameters.useShippingAddressForBilling" operator="equals" value="Y">
- <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList">
+ <entity-and entity-name="PartyContactMechPurpose" list-name="pcmpList" filter-by-date="true">
<field-map field-name="partyId" env-name="userLogin.partyId"/>
<field-map field-name="contactMechPurposeTypeId" value="BILLING_LOCATION"/>
</entity-and>
- <filter-list-by-date list-name="pcmpList"/>
<first-from-list list-name="pcmpList" entry-name="pcmp"/>
<if-compare-field field="parameters.shippingContactMechId" operator="not-equals" to-field="pcmp.contactMechId">
<if-not-empty field="pcmp">
@@ -1233,11 +1229,10 @@
<result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>
</call-service>
<else>
- <entity-and entity-name="PaymentMethod" list-name="paymentMethodList">
+ <entity-and entity-name="PaymentMethod" list-name="paymentMethodList" filter-by-date="true">
<field-map field-name="partyId" env-name="parameters.partyId"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <filter-list-by-date list-name="paymentMethodList"/>
<first-from-list list-name="paymentMethodList" entry-name="paymentMethod"/>
<set field="creditCardContext.paymentMethodId" from-field="paymentMethod.paymentMethodId"/>
<!-- Update Credit Card -->
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Sat Jul 19 14:33:38 2008
@@ -40,13 +40,12 @@
<!-- If the routing is not associated with our product and it's a variant, then
check to see if it's virtual product has the routing -->
<if-empty field="routingGS">
- <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList">
+ <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="productIdTo" env-name="parameters.productId" />
<condition-expr field-name="productAssocTypeId" value="PRODUCT_VARIANT" />
</condition-list>
</entity-condition>
- <filter-list-by-date list-name="virtualProductAssocList" valid-date-name="filterDate"/>
<first-from-list list-name="virtualProductAssocList" entry-name="virtualProductAssoc"/>
<if-not-empty field="virtualProductAssoc">
<set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/>
Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original)
+++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Sat Jul 19 14:33:38 2008
@@ -122,13 +122,12 @@
<set field="createPartyRoleCtx.partyId" from-field="parameters.partyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="CONTACT"/>
<call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/>
- <entity-and entity-name="PartyRelationship" list-name="partyRelationships">
+ <entity-and entity-name="PartyRelationship" list-name="partyRelationships" filter-by-date="true">
<field-map field-name="partyIdTo" env-name="parameters.partyId"/>
<field-map field-name="roleTypeIdTo" value="LEAD"/>
<field-map field-name="roleTypeIdFrom" value="ACCOUNT_LEAD"/>
<order-by field-name="-fromDate"/>
</entity-and>
- <filter-list-by-date list-name="partyRelationships" to-list-name="partyRelationships"/>
<first-from-list list-name="partyRelationships" entry-name="partyRelationship"/>
<if-not-empty field="partyRelationship">
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/communication/CommunicationEventServices.xml Sat Jul 19 14:33:38 2008
@@ -40,11 +40,10 @@
<!-- if only contactmechid and no partyTo is provided for creation email address create it -->
<if-empty field="parameters.partyIdTo">
<if-not-empty field="parameters.contactMechIdTo">
- <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs">
+ <entity-and entity-name="PartyAndContactMech" list-name="partyContactMechs" filter-by-date="true">
<field-map field-name="contactMechId" env-name="parameters.contactMechIdTo"/>
<field-map field-name="contactMechTypeId" value="EMAIL_ADDRESS"/>
</entity-and>
- <filter-list-by-date list-name="partyContactMechs"/>
<first-from-list entry-name="partyContactMech" list-name="partyContactMechs"/>
<set field="newEntity.partyIdTo" from-field="partyContactMech.partyId"/>
</if-not-empty>
Modified: ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml (original)
+++ ofbiz/trunk/applications/party/script/org/ofbiz/party/party/PartyServices.xml Sat Jul 19 14:33:38 2008
@@ -859,14 +859,13 @@
<set field="partyId" from-field="parameters.partyId"/>
</else>
</if-not-empty>
- <entity-condition entity-name="PartyContactDetailByPurpose" list-name="partyContactDetailByPurposes">
+ <entity-condition entity-name="PartyContactDetailByPurpose" list-name="partyContactDetailByPurposes" filter-by-date="true">
<condition-list>
<condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
<condition-expr field-name="partyId" operator="equals" env-name="partyId"/>
</condition-list>
</entity-condition>
- <filter-list-by-date list-name="partyContactDetailByPurposes" to-list-name="validPartyContactDetailByPurposes"/>
- <first-from-list entry-name="partyContactDetailByPurpose" list-name="validPartyContactDetailByPurposes"/>
+ <first-from-list entry-name="partyContactDetailByPurpose" list-name="partyContactDetailByPurposes"/>
<entity-one entity-name="PartyAndPerson" value-name="partyAndPerson"/>
<set field="bodyParameters.partyAndPerson" from-field="partyAndPerson"/>
<set field="contactMechId" from-field="partyContactDetailByPurpose.contactMechId"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/category/CategoryServices.xml Sat Jul 19 14:33:38 2008
@@ -722,13 +722,12 @@
<not><if-has-permission permission="CATALOG" action="_${checkAction}"/></not>
</condition>
<then>
- <entity-and entity-name="ProductCategoryRollupAndRole" list-name="roleCategories">
+ <entity-and entity-name="ProductCategoryRollupAndRole" list-name="roleCategories" filter-by-date="true">
<field-map field-name="productCategoryId" env-name="productCategoryIdToCheck"/>
<field-map field-name="partyId" env-name="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
</entity-and>
- <filter-list-by-date list-name="roleCategories" valid-date-name="nowTimestamp"/>
- <filter-list-by-date list-name="roleCategories" valid-date-name="nowTimestamp" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
+ <filter-list-by-date list-name="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
</then>
</if>
<log level="info" message="Checking category permission, roleCategories=${roleCategories}"/>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/product/product/ProductServices.xml Sat Jul 19 14:33:38 2008
@@ -71,12 +71,11 @@
<!-- if the user has the role limited position, add this product to the limit category/ies -->
<if-has-permission permission="CATALOG_ROLE" action="_CREATE">
- <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles">
+ <entity-and entity-name="ProductCategoryRole" list-name="productCategoryRoles" filter-by-date="true">
<field-map field-name="partyId" env-name="userLogin.partyId"/>
<field-map field-name="roleTypeId" value="LTD_ADMIN"/>
</entity-and>
- <filter-list-by-date list-name="productCategoryRoles" valid-date-name="nowTimestamp"/>
<iterate entry-name="productCategoryRole" list-name="productCategoryRoles">
<!-- add this new product to the category -->
<make-value value-name="newLimitMember" entity-name="ProductCategoryMember"/>
@@ -861,8 +860,8 @@
<set from-field="userLogin.partyId" field="lookupRoleCategoriesMap.partyId"/>
<set value="LTD_ADMIN" field="lookupRoleCategoriesMap.roleTypeId"/>
<find-by-and entity-name="ProductCategoryMemberAndRole" map-name="lookupRoleCategoriesMap" list-name="roleCategories"/>
- <filter-list-by-date list-name="roleCategories" valid-date-name="nowTimestamp"/>
- <filter-list-by-date list-name="roleCategories" valid-date-name="nowTimestamp" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
+ <filter-list-by-date list-name="roleCategories"/>
+ <filter-list-by-date list-name="roleCategories" from-field-name="roleFromDate" thru-field-name="roleThruDate"/>
</then>
</if>
<if>
Modified: ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original)
+++ ofbiz/trunk/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Sat Jul 19 14:33:38 2008
@@ -464,10 +464,9 @@
<set from-field="destTelecomOrderContactMech.contactMechId" field="shipment.destinationTelecomNumberId"/>
<else>
<!-- use the first unexpired phone number of the shipment partyIdTo -->
- <entity-and entity-name="PartyAndTelecomNumber" list-name="phoneNumbers">
+ <entity-and entity-name="PartyAndTelecomNumber" list-name="phoneNumbers" filter-by-date="true">
<field-map field-name="partyId" env-name="shipment.partyIdTo"/>
</entity-and>
- <filter-list-by-date list-name="phoneNumbers"/>
<first-from-list entry-name="phoneNumber" list-name="phoneNumbers"/>
<if-not-empty field="phoneNumber">
<set from-field="phoneNumber.contactMechId" field="shipment.destinationTelecomNumberId"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Sat Jul 19 14:33:38 2008
@@ -228,7 +228,7 @@
<!-- first try the WorkEffortAssignmentRate -->
<if-not-empty field="timeEntry.workEffortId">
- <entity-condition entity-name="WorkEffortAssignmentRate" list-name="workEffortAssignmentRateList">
+ <entity-condition entity-name="WorkEffortAssignmentRate" list-name="workEffortAssignmentRateList" filter-by-date="true">
<condition-list combine="and">
<condition-expr field-name="workEffortId" env-name="timeEntry.workEffortId"/>
<condition-expr field-name="partyId" env-name="timeEntry.partyId"/>
@@ -236,7 +236,6 @@
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
- <filter-list-by-date list-name="workEffortAssignmentRateList" all-same="true"/>
<first-from-list entry-name="workEffortAssignmentRate" list-name="workEffortAssignmentRateList"/>
<if-not-empty field="workEffortAssignmentRate">
<set field="rateAmount" from-field="workEffortAssignmentRate.rate"/>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=678222&r1=678221&r2=678222&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Sat Jul 19 14:33:38 2008
@@ -327,8 +327,7 @@
<field-map field-name="workEffortId" env-name="projectId"/>
<field-map field-name="partyId" env-name="partyId"/>
</entity-and>
- <filter-list-by-date list-name="projectAssigns" to-list-name="projectAssignsDated"/>
- <if-empty field="projectAssignsDated">
+ <if-empty field="projectAssigns">
<set field="isMember" value="false" type="Boolean"/>
<else>
<set field="isMember" value="true" type="Boolean"/>