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 15:47:03 UTC
svn commit: r739770 - in /ofbiz/trunk/applications/product:
webapp/catalog/category/ webapp/catalog/feature/ webapp/catalog/lookup/
webapp/catalog/price/ webapp/facility/facility/ webapp/facility/inventory/
webapp/facility/lookup/ widget/catalog/
Author: mrisaliti
Date: Sun Feb 1 14:47:02 2009
New Revision: 739770
URL: http://svn.apache.org/viewvc?rev=739770&view=rev
Log:
Artifact cleaning on product component after recent changes on xsd files (OFBIZ-2137)
Modified:
ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml
ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/category/CategoryForms.xml Sun Feb 1 14:47:02 2009
@@ -137,7 +137,7 @@
title="" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-condition entity-name="ProductCategoryLink">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sun Feb 1 14:47:02 2009
@@ -115,7 +115,7 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<set field="parameters.noConditionFind" value="Y"/>
- <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="ProductFeatureType"/>
<field-map field-name="orderBy" value="productFeatureTypeId"/>
@@ -160,7 +160,7 @@
odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<set field="parameters.noConditionFind" value="Y"/>
- <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="ProductFeatureIactn"/>
<field-map field-name="orderBy" value="productFeatureId"/>
@@ -277,7 +277,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
<actions>
<set field="parameters.noConditionFind" value="Y"/>
- <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="ProductFeatureCategory"/>
<field-map field-name="orderBy" value="productFeatureCategoryId"/>
@@ -304,7 +304,7 @@
<form name="ListFeaturePrice" type="list" target="updateFeaturePrice" list-name="productFeaturePrice"
odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
- <entity-and entity-name="ProductFeaturePrice" list-name="productFeaturePrice">
+ <entity-and entity-name="ProductFeaturePrice" list="productFeaturePrice">
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/lookup/FieldLookupForms.xml Sun Feb 1 14:47:02 2009
@@ -47,7 +47,7 @@
<form name="listLookupProduct" list-name="listIt" title="" type="list" paginate-target="LookupProduct"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="Product"/>
</service>
@@ -70,7 +70,7 @@
<form name="listLookupVirtualProduct" list-name="listIt" title="" type="list" extends="listLookupProduct"
paginate-target="LookupVirtualProduct" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="Product"/>
</service>
@@ -132,7 +132,7 @@
<form name="listLookupProductAndPrice" list-name="listIt" title="" type="list"
paginate-target="LookupProductAndPrice" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="ProductAndPriceView"/>
</service>
@@ -197,7 +197,7 @@
<form name="listLookupProductCategory" list-name="listIt" title="" type="list"
paginate-target="LookupProductCategory" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="ProductCategory"/>
</service>
@@ -238,7 +238,7 @@
<form name="listLookupProductFeature" list-name="listIt" title="" type="list" paginate-target="LookupProductFeature"
odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="ProductFeature"/>
</service>
@@ -264,7 +264,7 @@
<form name="listLookupProductStore" list-name="listIt" target="" title="" type="list"
paginate-target="LookupProductStore" odd-row-style="alternate-row" default-table-style="basic-table" view-size="20">
<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="ProductStore"/>
</service>
Modified: ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/price/PriceForms.xml Sun Feb 1 14:47:02 2009
@@ -26,7 +26,7 @@
<set field="noConditionFind" value="Y"/>
<set field="parameters.productPriceRuleId" value=""/>
<set field="parameters.ruleName" value=""/>
- <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="ProductPriceRule"/>
</service>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityForms.xml Sun Feb 1 14:47:02 2009
@@ -23,7 +23,7 @@
<form name="FindFacility" type="list" list-name="listIt" paginate-target="FindFacility"
odd-row-style="alternate-row" header-row-style="header-row-2" 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="Facility"/>
</service>
@@ -83,7 +83,7 @@
<form name="ListFacilityInventoryItems" type="list" list-name="listIt" header-row-style="header-row-2"
paginate-target="EditFacilityInventoryItems" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="results" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="InventoryItemAndLocation"/>
<field-map field-name="orderBy" value="statusId|quantityOnHandTotal|serialNumber"/>
@@ -187,7 +187,7 @@
<form name="ListFacilityInventoryItemsDetailsByItem" type="list" target="" title="" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="results" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="InventoryItemAndDetail"/>
<field-map field-name="orderBy" value="productId|inventoryItemId|-inventoryItemDetailSeqId|-effectiveDate|quantityOnHandTotal"/>
@@ -238,7 +238,7 @@
<form name="ListFacilityInventoryItemsDetailsByProduct" type="list" target="" title="" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="results" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="InventoryItemAndDetail"/>
<field-map field-name="orderBy" value="productId|-effectiveDate|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/>
@@ -281,7 +281,7 @@
<form name="ListFacilityInventoryItemsDetailsByDate" type="list" target="" title="" list-name="listIt"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <service service-name="performFind" result-map="results" result-map-list-name="listIt">
+ <service service-name="performFind" result-map="results" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="InventoryItemAndDetail"/>
<field-map field-name="orderBy" value="-effectiveDate|productId|inventoryItemId|-inventoryItemDetailSeqId|quantityOnHandTotal"/>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sun Feb 1 14:47:02 2009
@@ -143,7 +143,7 @@
<form name="ViewInventoryItemShipmentReceipts" type="list" target="" title="" list-name="shipmentReceiptList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
- <entity-and entity-name="ShipmentReceipt" list-name="shipmentReceiptList">
+ <entity-and entity-name="ShipmentReceipt" list="shipmentReceiptList">
<field-map field-name="inventoryItemId"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/lookup/FieldLookupForms.xml Sun Feb 1 14:47:02 2009
@@ -40,7 +40,7 @@
<form name="listLookupFacility" list-name="listIt" title="" type="list"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupFacility">
<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="Facility"/>
</service>
@@ -76,7 +76,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar"
paginate-target="LookupFacilityLocation">
<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="FacilityLocation"/>
</service>
@@ -116,7 +116,7 @@
<form name="listShipment" list-name="listIt" title="" type="list" paginate-target="LookupShipment"
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="Shipment"/>
</service>
Modified: ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CatalogScreens.xml Sun Feb 1 14:47:02 2009
@@ -71,7 +71,7 @@
<set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
- <entity-and entity-name="ProdCatalogCategory" list-name="prodCatalogCategories">
+ <entity-and entity-name="ProdCatalogCategory" list="prodCatalogCategories">
<field-map field-name="prodCatalogId"/>
<order-by field-name="prodCatalogCategoryTypeId"/>
<order-by field-name="sequenceNum"/>
@@ -133,7 +133,7 @@
<set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
- <entity-and entity-name="ProdCatalogRole" list-name="prodCatalogRoleList">
+ <entity-and entity-name="ProdCatalogRole" list="prodCatalogRoleList">
<field-map field-name="prodCatalogId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="partyId"/>
@@ -191,7 +191,7 @@
<set field="prodCatalogId" from-field="parameters.prodCatalogId"/>
<entity-one entity-name="ProdCatalog" value-field="prodCatalog"/>
- <entity-and entity-name="ProductStoreCatalog" list-name="productStoreCatalogList">
+ <entity-and entity-name="ProductStoreCatalog" list="productStoreCatalogList">
<field-map field-name="prodCatalogId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productStoreId"/>
Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Sun Feb 1 14:47:02 2009
@@ -101,9 +101,9 @@
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory" value-field="productCategory"/>
- <get-related-one value-name="productCategory" relation-name="ProductCategoryType" to-value-name="productCategoryType"/>
+ <get-related-one value-field="productCategory" relation-name="ProductCategoryType" to-value-field="productCategoryType"/>
<set field="categoryContentOrderList[]" value="prodCatContentTypeId"/>
- <get-related value-name="productCategory" relation-name="ProductCategoryContent" list-name="productCategoryContentList" order-by-list-name="categoryContentOrderList"/>
+ <get-related value-field="productCategory" relation-name="ProductCategoryContent" list="productCategoryContentList" order-by-list="categoryContentOrderList"/>
<entity-condition entity-name="ProductCategoryType" list="productCategoryTypes"/>
</actions>
@@ -249,11 +249,11 @@
<set field="productCategoryId" from-field="parameters.showProductCategoryId"/>
<entity-condition entity-name="ProductCategoryRollup" list="currentProductCategoryRollups">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
<entity-condition entity-name="ProductCategoryRollup" list="parentProductCategoryRollups">
- <condition-expr field-name="parentProductCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="parentProductCategoryId" from-field="productCategoryId"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
@@ -303,8 +303,8 @@
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory" value-field="productCategory"/>
- <entity-condition entity-name="ProdCatalogCategory" list="prodCatalogCategories">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <entity-condition entity-name="ProdCatalogCategory" list="prodCatalogCategories">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="prodCatalogCategoryTypeId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="prodCatalogId"/>
@@ -339,12 +339,12 @@
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory" value-field="productCategory"/>
- <entity-condition entity-name="ProductFeatureCategoryAppl" list="productFeatureCategoryAppls">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <entity-condition entity-name="ProductFeatureCategoryAppl" list="productFeatureCategoryAppls">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="productFeatureCategoryId"/>
</entity-condition>
<entity-condition entity-name="ProductFeatureCatGrpAppl" list="productFeatureCatGrpAppls">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="productFeatureGroupId"/>
</entity-condition>
@@ -377,8 +377,8 @@
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory" value-field="productCategory"/>
- <entity-condition entity-name="ProductCategoryRole" list="productCategoryRoles">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <entity-condition entity-name="ProductCategoryRole" list="productCategoryRoles">
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
<order-by field-name="roleTypeId"/>
<order-by field-name="partyId"/>
</entity-condition>
@@ -408,7 +408,7 @@
<set field="productCategoryId" from-field="parameters.productCategoryId"/>
<entity-one entity-name="ProductCategory" value-field="productCategory"/>
<entity-condition entity-name="ProductCategoryAttribute" list="categoryAttributes">
- <condition-expr field-name="productCategoryId" env-name="productCategoryId"/>
+ <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>
</entity-condition>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Sun Feb 1 14:47:02 2009
@@ -142,15 +142,14 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="ProductConfigProduct" value-field="productConfigProduct" auto-field-map="true"/>
-
<entity-condition entity-name="ProductConfigOption" list="configOptionList">
- <condition-expr field-name="configItemId" env-name="configItemId"/>
+ <condition-expr field-name="configItemId" from-field="configItemId"/>
<order-by field-name="sequenceNum"/>
</entity-condition>
<entity-condition entity-name="ProductConfigProduct" list="configProducts">
<condition-list combine="and">
- <condition-expr field-name="configItemId" env-name="configItemId"/>
- <condition-expr field-name="configOptionId" env-name="configOptionId"/>
+ <condition-expr field-name="configItemId" from-field="configItemId"/>
+ <condition-expr field-name="configOptionId" from-field="configOptionId"/>
</condition-list>
<order-by field-name="sequenceNum"/>
</entity-condition>
Modified: ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FeatureScreens.xml Sun Feb 1 14:47:02 2009
@@ -61,7 +61,7 @@
<set field="titleProperty" value="PageTitleEditFeature"/>
<set field="headerItem" value="featurecats"/>
<entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/>
- <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures">
+ <entity-and entity-name="SupplierProductFeature" list="supplierProductFeatures">
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
</entity-and>
</actions>
@@ -383,14 +383,14 @@
<set field="productFeatureGroupId" from-field="parameters.productFeatureGroupId"/>
<set field="productFeatureCategoryId" from-field="parameters.productFeatureCategoryId"/>
- <entity-and entity-name="ProductFeatureGroupAndAppl" list-name="productFeatureGroupAndAppls">
+ <entity-and entity-name="ProductFeatureGroupAndAppl" list="productFeatureGroupAndAppls">
<field-map field-name="productFeatureGroupId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
<entity-condition entity-name="ProductFeatureCategory" list="productFeatureCategories">
<order-by field-name="description"/>
</entity-condition>
- <entity-and entity-name="ProductFeature" list-name="productFeatures">
+ <entity-and entity-name="ProductFeature" list="productFeatures">
<field-map field-name="productFeatureCategoryId"/>
</entity-and>
</actions>
@@ -535,7 +535,7 @@
<set field="titleProperty" value="PageTitleEditFeature"/>
<set field="headerItem" value="featurecats"/>
<entity-one entity-name="ProductFeature" value-field="productFeature" auto-field-map="true"/>
- <entity-and entity-name="SupplierProductFeature" list-name="supplierProductFeatures">
+ <entity-and entity-name="SupplierProductFeature" list="supplierProductFeatures">
<field-map field-name="productFeatureId" from-field="parameters.productFeatureId"/>
</entity-and>
</actions>
Modified: ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/FindScreens.xml Sun Feb 1 14:47:02 2009
@@ -122,7 +122,7 @@
</entity-one>
<entity-condition entity-name="GoodIdentification" list="goodIdentifications">
- <condition-expr field-name="idValue" env-name="idValue"/>
+ <condition-expr field-name="idValue" from-field="idValue"/>
<order-by field-name="productId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Sun Feb 1 14:47:02 2009
@@ -110,7 +110,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
- <entity-and entity-name="ProductPrice" list-name="productPrices">
+ <entity-and entity-name="ProductPrice" list="productPrices">
<field-map field-name="productId"/>
<order-by field-name="productStoreGroupId"/>
<order-by field-name="productPricePurposeId"/>
@@ -169,17 +169,17 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="SupplierProduct" list="supplierProductAgreements">
<condition-list>
- <condition-expr field-name="productId" env-name="productId"/>
- <condition-expr field-name="agreementId" operator="not-equals" env-name="nullField"/>
+ <condition-expr field-name="productId" from-field="productId"/>
+ <condition-expr field-name="agreementId" operator="not-equals" from-field="nullField"/>
</condition-list>
<order-by field-name="availableFromDate"/>
</entity-condition>
- <entity-and entity-name="AgreementItemAndProductAppl" list-name="salesAgreements">
+ <entity-and entity-name="AgreementItemAndProductAppl" list="salesAgreements">
<field-map field-name="productId"/>
<field-map field-name="agreementTypeId" value="SALES_AGREEMENT"/>
<order-by field-name="fromDate"/>
</entity-and>
- <entity-and entity-name="AgreementItemAndProductAppl" list-name="productAgreements">
+ <entity-and entity-name="AgreementItemAndProductAppl" list="productAgreements">
<field-map field-name="productId"/>
<field-map field-name="agreementTypeId" value="PRODUCT_AGREEMENT"/>
<order-by field-name="fromDate"/>
@@ -246,7 +246,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductCategoryMember" list="productCategoryMembers">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productCategoryId"/>
</entity-condition>
@@ -298,7 +298,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
- <entity-and entity-name="ProductConfig" list-name="productConfigs">
+ <entity-and entity-name="ProductConfig" list="productConfigs">
<field-map field-name="productId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="fromDate"/>
@@ -350,7 +350,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="FixedAssetProduct" list="fixedAssetProducts">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
</entity-condition>
</actions>
<widgets>
@@ -472,16 +472,16 @@
<set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/>
<entity-one entity-name="Product" value-field="product"/>
- <entity-and entity-name="ProductAssoc" list-name="components">
+ <entity-and entity-name="ProductAssoc" list="components">
<field-map field-name="productId"/>
<field-map field-name="productAssocTypeId"/>
<order-by field-name="sequenceNum"/>
</entity-and>
- <entity-and entity-name="ProductAssoc" list-name="parents">
+ <entity-and entity-name="ProductAssoc" list="parents">
<field-map from-field="productId" field-name="productIdTo"/>
<field-map field-name="productAssocTypeId"/>
</entity-and>
- <entity-and entity-name="WorkEffortGoodStandard" list-name="routings">
+ <entity-and entity-name="WorkEffortGoodStandard" list="routings">
<field-map field-name="productId"/>
<field-map field-name="workEffortGoodStdTypeId"/>
</entity-and>
@@ -556,7 +556,7 @@
<field-map field-name="costComponentId" from-field="productCostComponentId"/>
</entity-one>
<!--<entity-and entity-name="CostComponent" list-name="costs" filter-by-date="true">-->
- <entity-and entity-name="CostComponent" list-name="costs">
+ <entity-and entity-name="CostComponent" list="costs">
<field-map field-name="productId"/>
<order-by field-name="-fromDate"/>
</entity-and>
@@ -687,7 +687,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductFacility" list="productFacilities">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="facilityId"/>
</entity-condition>
<entity-condition entity-name="Facility" list="facilities">
@@ -741,7 +741,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductFacilityLocation" list="productFacilityLocations">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="facilityId"/>
<order-by field-name="locationSeqId"/>
</entity-condition>
@@ -795,7 +795,7 @@
<entity-one entity-name="Product" value-field="product"/>
<set field="orderByList[]" value="-relevancyWeight"/>
<set field="orderByList[]" value="keyword"/>
- <get-related value-name="product" relation-name="ProductKeyword" list-name="productKeywords" order-by-list-name="orderByList"/>
+ <get-related value-field="product" relation-name="ProductKeyword" list="productKeywords" order-by-list="orderByList"/>
</actions>
<widgets>
<decorator-screen name="CommonProductDecorator" location="${parameters.mainDecoratorLocation}">
@@ -899,7 +899,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="GoodIdentification" list="goodIdentifications">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="goodIdentificationTypeId"/>
<order-by field-name="idValue"/>
</entity-condition>
@@ -954,7 +954,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductGlAccount" list="productGlAccounts">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="glAccountTypeId"/>
</entity-condition>
<entity-condition entity-name="GlAccountType" list="productGlAccountTypes" use-cache="true">
@@ -1024,7 +1024,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductPaymentMethodType" list="productPaymentMethodTypes">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="productPricePurposeId"/>
<order-by field-name="paymentMethodTypeId"/>
<order-by field-name="fromDate"/>
@@ -1077,7 +1077,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
<script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductFeatures.groovy"/>
- <entity-and entity-name="ProductFeatureIactn" list-name="featureInteractions">
+ <entity-and entity-name="ProductFeatureIactn" list="featureInteractions">
<field-map field-name="productId" from-field="parameters.productId"/>
</entity-and>
</actions>
@@ -1161,7 +1161,7 @@
<set field="orderBy" from-field="parameters.orderBy" default-value="partyId"/>
<entity-one entity-name="Product" value-field="product"/>
- <entity-and entity-name="SupplierProduct" list-name="productSuppliers">
+ <entity-and entity-name="SupplierProduct" list="productSuppliers">
<field-map field-name="productId"/>
<order-by field-name="${orderBy}"/>
</entity-and>
@@ -1355,7 +1355,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-one entity-name="Product" value-field="product"/>
- <entity-and entity-name="ProductAttribute" list-name="productAttributes">
+ <entity-and entity-name="ProductAttribute" list="productAttributes">
<field-map field-name="productId"/>
<order-by field-name="attrType"/>
<order-by field-name="attrName"/>
@@ -1740,7 +1740,7 @@
<entity-one entity-name="Product" value-field="product"/>
<entity-condition entity-name="ProductRole" list="productRoles">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
<order-by field-name="roleTypeId"/>
<order-by field-name="partyId"/>
</entity-condition>
@@ -1777,7 +1777,7 @@
<set field="productId" from-field="parameters.productId"/>
<entity-condition entity-name="VendorProduct" list="vendorProductList">
- <condition-expr field-name="productId" env-name="productId"/>
+ <condition-expr field-name="productId" from-field="productId"/>
</entity-condition>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Feb 1 14:47:02 2009
@@ -69,8 +69,8 @@
<set field="tabButtonItem" value="ProductPromo"/>
<set field="userEntered" from-field="parameters.userEntered"/>
- <entity-condition entity-name="ProductPromo" list-name="productPromos">
- <condition-expr field-name="userEntered" env-name="userEntered" ignore-if-empty="true"/>
+ <entity-condition entity-name="ProductPromo" list="productPromos">
+ <condition-expr field-name="userEntered" from-field="userEntered" ignore-if-empty="true"/>
<order-by field-name="-createdDate"/>
</entity-condition>
</actions>
@@ -164,21 +164,21 @@
<entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/>
<!-- Data Related to the Promo -->
- <entity-condition entity-name="ProductPromoRule" list-name="productPromoRules">
- <condition-expr field-name="productPromoId" env-name="productPromoId"/>
+ <entity-condition entity-name="ProductPromoRule" list="productPromoRules">
+ <condition-expr field-name="productPromoId" from-field="productPromoId"/>
<order-by field-name="ruleName"/>
</entity-condition>
- <entity-condition entity-name="ProductPromoCategory" list-name="promoProductPromoCategories">
+ <entity-condition entity-name="ProductPromoCategory" list="promoProductPromoCategories">
<condition-list>
- <condition-expr field-name="productPromoId" env-name="productPromoId"/>
+ <condition-expr field-name="productPromoId" from-field="productPromoId"/>
<condition-expr field-name="productPromoRuleId" value="_NA_"/>
<condition-expr field-name="productPromoActionSeqId" value="_NA_"/>
<condition-expr field-name="productPromoCondSeqId" value="_NA_"/>
</condition-list>
</entity-condition>
- <entity-condition entity-name="ProductPromoProduct" list-name="promoProductPromoProducts">
+ <entity-condition entity-name="ProductPromoProduct" list="promoProductPromoProducts">
<condition-list>
- <condition-expr field-name="productPromoId" env-name="productPromoId"/>
+ <condition-expr field-name="productPromoId" from-field="productPromoId"/>
<condition-expr field-name="productPromoRuleId" value="_NA_"/>
<condition-expr field-name="productPromoActionSeqId" value="_NA_"/>
<condition-expr field-name="productPromoCondSeqId" value="_NA_"/>
@@ -186,27 +186,27 @@
</entity-condition>
<!-- General Data for Drop-downs, etc -->
- <entity-condition entity-name="Enumeration" list-name="inputParamEnums" use-cache="true">
+ <entity-condition entity-name="Enumeration" list="inputParamEnums" use-cache="true">
<condition-expr field-name="enumTypeId" value="PROD_PROMO_IN_PARAM"/>
<order-by field-name="sequenceId"/>
</entity-condition>
- <entity-condition entity-name="Enumeration" list-name="condOperEnums" use-cache="true">
+ <entity-condition entity-name="Enumeration" list="condOperEnums" use-cache="true">
<condition-expr field-name="enumTypeId" value="PROD_PROMO_COND"/>
<order-by field-name="sequenceId"/>
</entity-condition>
- <entity-condition entity-name="Enumeration" list-name="productPromoActionEnums" use-cache="true">
+ <entity-condition entity-name="Enumeration" list="productPromoActionEnums" use-cache="true">
<condition-expr field-name="enumTypeId" value="PROD_PROMO_ACTION"/>
<order-by field-name="sequenceId"/>
</entity-condition>
- <entity-condition entity-name="Enumeration" list-name="productPromoApplEnums" use-cache="true">
+ <entity-condition entity-name="Enumeration" list="productPromoApplEnums" use-cache="true">
<condition-expr field-name="enumTypeId" value="PROD_PROMO_PCAPPL"/>
<order-by field-name="sequenceId"/>
</entity-condition>
- <entity-condition entity-name="OrderAdjustmentType" list-name="orderAdjustmentTypes" use-cache="true">
+ <entity-condition entity-name="OrderAdjustmentType" list="orderAdjustmentTypes" use-cache="true">
<order-by field-name="description"/>
</entity-condition>
- <entity-condition entity-name="ProductCategory" list-name="productCategories">
+ <entity-condition entity-name="ProductCategory" list="productCategories">
<condition-expr field-name="showInSelect" operator="not-equals" value="N"/>
<order-by field-name="description"/>
</entity-condition>
@@ -232,13 +232,13 @@
<set field="productPromoId" from-field="parameters.productPromoId"/>
<entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/>
- <entity-condition entity-name="ProductStorePromoAppl" list-name="productStorePromoAppls">
- <condition-expr field-name="productPromoId" env-name="productPromoId"/>
+ <entity-condition entity-name="ProductStorePromoAppl" list="productStorePromoAppls">
+ <condition-expr field-name="productPromoId" from-field="productPromoId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productPromoId"/>
</entity-condition>
- <entity-condition entity-name="ProductStore" list-name="productStores">
+ <entity-condition entity-name="ProductStore" list="productStores">
<order-by field-name="storeName"/>
</entity-condition>
</actions>
@@ -265,10 +265,10 @@
<entity-one entity-name="ProductPromo" value-field="productPromo" auto-field-map="true"/>
<set field="manualOnly" from-field="parameters.manualOnly" default-value="Y"/>
- <entity-condition entity-name="ProductPromoCode" list-name="productPromoCodes">
+ <entity-condition entity-name="ProductPromoCode" list="productPromoCodes">
<condition-list combine="and">
- <condition-expr field-name="productPromoId" env-name="productPromoId"/>
- <condition-expr field-name="userEntered" env-name="manualOnly"/>
+ <condition-expr field-name="productPromoId" from-field="productPromoId"/>
+ <condition-expr field-name="userEntered" from-field="manualOnly"/>
</condition-list>
<order-by field-name="-createdDate"/>
</entity-condition>
Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Sun Feb 1 14:47:02 2009
@@ -129,8 +129,8 @@
<set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/>
<entity-condition entity-name="ProductStorePromoAndAppl" list="productStorePromoAndAppls" filter-by-date="${activeOnly}">
<condition-list combine="and">
- <condition-expr field-name="userEntered" env-name="userEntered" ignore-if-empty="true"/>
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="userEntered" from-field="userEntered" ignore-if-empty="true"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
</condition-list>
<order-by field-name="sequenceNum"/>
<order-by field-name="productPromoId"/>
@@ -196,7 +196,7 @@
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ProductStoreCatalog" list="productStoreCatalogs">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
<order-by field-name="sequenceNum"/>
<order-by field-name="productStoreId"/>
</entity-condition>
@@ -250,7 +250,7 @@
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="WebSite" list="storeWebSites">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
<order-by field-name="siteName"/>
</entity-condition>
<entity-condition entity-name="WebSite" list="webSites">
@@ -279,7 +279,7 @@
<set field="productStoreId" from-field="parameters.productStoreId"/>
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ProductStoreShipmentMethView" list="storeShipMethods">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
<order-by field-name="sequenceNumber"/>
</entity-condition>
<entity-one entity-name="ProductStoreShipmentMeth" value-field="productStoreShipmentMeth" auto-field-map="true"/>
@@ -358,7 +358,7 @@
<set field="productStoreId" from-field="parameters.productStoreId"/>
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ShipmentCostEstimate" list="estimates">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
<order-by field-name="geoIdFrom"/>
<order-by field-name="shipmentMethodTypeId"/>
<order-by field-name="geoIdTo"/>
@@ -491,7 +491,7 @@
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ProductStoreEmailSetting" list="productStoreEmailSettings">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
<order-by field-name="emailType"/>
</entity-condition>
</actions>
@@ -567,7 +567,7 @@
<entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>
<entity-condition entity-name="ProductStoreKeywordOvrd" list="productStorekeywordOvrdList">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
</entity-condition>
</actions>
<widgets>
@@ -659,7 +659,7 @@
<entity-one entity-name="ProductStoreFinActSetting" value-field="finAccountSetting"/>
<entity-condition entity-name="ProductStoreFinActSetting" list="productStoreFinActSettings">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
</entity-condition>
</actions>
<widgets>
@@ -711,7 +711,7 @@
<set field="productStoreId" from-field="parameters.productStoreId"/>
<entity-condition entity-name="ProductStoreVendorPayment" list="productStoreVendorPaymentList">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
</entity-condition>
</actions>
<widgets>
@@ -762,7 +762,7 @@
<set field="productStoreId" from-field="parameters.productStoreId"/>
<entity-condition entity-name="ProductStoreVendorShipment" list="productStoreVendorShipmentList">
- <condition-expr field-name="productStoreId" env-name="productStoreId"/>
+ <condition-expr field-name="productStoreId" from-field="productStoreId"/>
</entity-condition>
</actions>
<widgets>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionForms.xml Sun Feb 1 14:47:02 2009
@@ -91,7 +91,7 @@
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table"
paginate-target="FindSubscription" paginate="true">
<actions>
- <service service-name="performFind" result-map-list-name="listIt" result-map="performFindResult">
+ <service service-name="performFind" result-map-list="listIt" result-map="performFindResult">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Subscription"/>
</service>
@@ -318,7 +318,7 @@
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-condition entity-name="ProductSubscriptionResource">
- <condition-expr field-name="subscriptionResourceId" env-name="subscriptionResourceId"/>
+ <condition-expr field-name="subscriptionResourceId" from-field="subscriptionResourceId"/>
<order-by field-name="productId"/>
<order-by field-name="fromDate"/>
</entity-condition>
@@ -392,7 +392,7 @@
header-row-style="header-row-2" odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
<entity-condition entity-name="SubscriptionAndCommEvent">
- <condition-expr field-name="subscriptionId" env-name="subscriptionId"/>
+ <condition-expr field-name="subscriptionId" from-field="subscriptionId"/>
<order-by field-name="communicationEventId"/>
</entity-condition>
</actions>
Modified: ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml?rev=739770&r1=739769&r2=739770&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/SubscriptionScreens.xml Sun Feb 1 14:47:02 2009
@@ -132,7 +132,7 @@
<set field="titleProperty" value="PageTitleEditSubscriptionAttributes"/>
<set field="tabButtonItem" value="EditSubscriptionAttributes"/>
<set field="subscriptionId" from-field="parameters.subscriptionId"/>
- <entity-and entity-name="SubscriptionAttribute" use-cache="false" list-name="subscriptionAttributes">
+ <entity-and entity-name="SubscriptionAttribute" use-cache="false" list="subscriptionAttributes">
<field-map field-name="subscriptionId"/>
<order-by field-name="attrName"/>
</entity-and>
@@ -277,7 +277,7 @@
<set field="titleProperty" value="PageTitleEditSubscriptionCommEvent" />
<set field="tabButtonItem" value="EditSubscriptionCommEvent" />
<set field="subscriptionId" from-field="parameters.subscriptionId" />
- <entity-and entity-name="SubscriptionAndCommEvent" use-cache="false" list-name="subscriptionCommEvent">
+ <entity-and entity-name="SubscriptionAndCommEvent" use-cache="false" list="subscriptionCommEvent">
<field-map field-name="subscriptionId" />
</entity-and>
</actions>