svn commit: r1170469 - in /ofbiz: branches/release11.04/applicat
Locked
svn commit: r1170469 - in /ofbiz: branches/release11.04/applicat
 
|
Author: sascharodekamp
Date: Wed Sep 14 08:14:45 2011 New Revision: 1170469 URL: http://svn.apache.org/viewvc?rev=1170469&view=rev Log: UPDATE: The "Orders" tab in "Catalog > Products" is not working (https://issues.apache.org/jira/browse/OFBIZ-4403). A patch from Atul Vani which fixes the Order Tab in Catalog >Products. Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml?rev=1170469&r1=1170468&r2=1170469&view=diff ============================================================================== --- ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/branches/release11.04/applications/product/widget/catalog/ProductScreens.xml Wed Sep 14 08:14:45 2011 @@ -30,7 +30,9 @@ under the License. <set field="headerItem" value="products"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="productId" from-field="parameters.productId"/> + <set field="productId" from-field="parameters.productId" global="true"/> + <entity-one entity-name="Product" value-field="product"/> + <set field="product" from-field="product" global="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -158,8 +160,6 @@ under the License. <set field="tabButtonItem" value="EditProduct"/> <set field="labelTitleProperty" value="ProductProduct"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <set field="parameters.bypassIfNoProduct" value="true"/> </actions> <widgets> @@ -209,10 +209,8 @@ under the License. <set field="tabButtonItem" value="EditProductPrices"/> <set field="labelTitleProperty" value="ProductPrices"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductPrice" list="productPrices"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <order-by field-name="productStoreGroupId"/> <order-by field-name="productPricePurposeId"/> <order-by field-name="productPriceTypeId"/> @@ -246,7 +244,6 @@ under the License. <set field="labelTitleProperty" value="ProductAgreements"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="SupplierProduct" list="supplierProductAgreements"> <condition-list> <condition-expr field-name="productId" from-field="productId"/> @@ -294,11 +291,8 @@ under the License. <set field="tabButtonItem" value="EditProductCategories"/> <set field="labelTitleProperty" value="ProductCategoryMembers"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductCategoryMember" list="productCategoryMembers"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productCategoryId"/> </entity-condition> @@ -439,7 +433,6 @@ under the License. <set field="productAssocTypeId" value="MANUF_COMPONENT"/> <set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAssoc" list="components"> <field-map field-name="productId"/> <field-map field-name="productAssocTypeId"/> @@ -486,7 +479,6 @@ under the License. <!-- default currency in framework/common/config/general.properties --> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="CostComponent" value-field="costComponent" auto-field-map="false"> <field-map field-name="costComponentId" from-field="productCostComponentId"/> </entity-one> @@ -553,7 +545,6 @@ under the License. <set field="labelTitleProperty" value="ProductQuickAddVariants"/> <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/QuickAddVariants.groovy"/> </actions> @@ -577,9 +568,6 @@ under the License. <set field="tabButtonItem" value="EditProductQuickAdmin"/> <set field="labelTitleProperty" value="ProductQuickAdmin"/> - <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/EditProductQuickAdmin.groovy"/> </actions> <widgets> @@ -605,11 +593,8 @@ under the License. <set field="tabButtonItem" value="EditProductFacilities"/> <set field="labelTitleProperty" value="ProductFacilities"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacility" list="productFacilities"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="facilityId"/> </entity-condition> <entity-condition entity-name="Facility" list="facilities"> @@ -637,11 +622,8 @@ under the License. <set field="tabButtonItem" value="EditProductFacilityLocations"/> <set field="labelTitleProperty" value="ProductFacilityLocations"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacilityLocation" list="productFacilityLocations"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="facilityId"/> <order-by field-name="locationSeqId"/> </entity-condition> @@ -745,10 +727,8 @@ under the License. <set field="tabButtonItem" value="EditProductGoodIdentifications"/> <set field="labelTitleProperty" value="ProductGoodIdentification"/> - <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" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="goodIdentificationTypeId"/> <order-by field-name="idValue"/> </entity-condition> @@ -777,11 +757,8 @@ under the License. <set field="tabButtonItem" value="EditProductGlAccounts"/> <set field="labelTitleProperty" value="ProductGlAccounts"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductGlAccount" list="productGlAccounts"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="glAccountTypeId"/> </entity-condition> <entity-condition entity-name="GlAccountType" list="productGlAccountTypes" use-cache="true"> @@ -827,11 +804,8 @@ under the License. <set field="tabButtonItem" value="EditProductPaymentMethodTypes"/> <set field="labelTitleProperty" value="ProductPaymentTypes"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductPaymentMethodType" list="productPaymentMethodTypes"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="productPricePurposeId"/> <order-by field-name="paymentMethodTypeId"/> <order-by field-name="fromDate"/> @@ -860,7 +834,6 @@ under the License. <set field="labelTitleProperty" value="ProductFeatures"/> <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="featureInteractions"> <field-map field-name="productId" from-field="parameters.productId"/> @@ -905,9 +878,6 @@ under the License. <!-- default currency in framework/common/config/general.properties --> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <set field="productId" from-field="parameters.productId"/> - <set field="orderBy" from-field="parameters.orderBy" default-value="partyId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="SupplierProduct" value-field="supplierProduct" auto-field-map="true"/> </actions> <widgets> @@ -939,9 +909,10 @@ under the License. <set field="tabButtonItem" value="EditProductContent"/> <set field="labelTitleProperty" value="ProductContent"/> + <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> + <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy"/> </actions> <widgets> @@ -1008,10 +979,8 @@ under the License. <set field="tabButtonItem" value="EditProductAttributes"/> <set field="labelTitleProperty" value="ProductAttributes"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAttribute" list="productAttributes"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <order-by field-name="attrType"/> <order-by field-name="attrName"/> </entity-and> @@ -1037,8 +1006,6 @@ under the License. <set field="tabButtonItem" value="EditProductAssoc"/> <set field="labelTitleProperty" value="ProductAssociations"/> - <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/EditProductAssoc.groovy"/> </actions> <widgets> @@ -1147,7 +1114,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductMaintenance"/> <set field="labelTitleProperty" value="ProductMaintenance"/> <set field="tabButtonItem" value="EditProductMaints"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1169,7 +1135,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductMeters"/> <set field="labelTitleProperty" value="ProductMeters"/> <set field="tabButtonItem" value="EditProductMeters"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1190,7 +1155,6 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditProductGeos"/> <set field="tabButtonItem" value="EditProductGeos"/> - <set field="productId" from-field="parameters.productId"/> <set field="labelTitleProperty" value="ProductGeos"/> </actions> <widgets> @@ -1214,7 +1178,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductSubscriptionResources"/> <set field="tabButtonItem" value="EditProductSubscriptionResources"/> <set field="labelTitleProperty" value="ProductSubscriptionResources"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1237,7 +1200,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductWorkEffort"/> <set field="tabButtonItem" value="EditProductWorkEfforts"/> <set field="labelTitleProperty" value="ProductWorkEffort"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1281,11 +1243,8 @@ under the License. <set field="tabButtonItem" value="EditProductParties"/> <set field="labelTitleProperty" value="PartyParties"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductRole" list="productRoles"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="roleTypeId"/> <order-by field-name="partyId"/> </entity-condition> @@ -1314,9 +1273,8 @@ under the License. <set field="tabButtonItem" value="EditVendorProduct"/> <set field="labelTitleProperty" value="PartyVendor"/> - <set field="productId" from-field="parameters.productId"/> <entity-condition entity-name="VendorProduct" list="vendorProductList"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> </entity-condition> </actions> <widgets> @@ -1365,6 +1323,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleViewProductOrders"/> + <set field="tabButtonItem" value="viewProductOrder"/> <set field="labelTitleProperty" value="OrderOrders"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/> </actions> @@ -1385,10 +1344,8 @@ under the License. <set field="titleProperty" value="PageTitleCommEvents"/> <set field="tabButtonItem" value="EditProductCommunicationEvents"/> <set field="labelTitleProperty" value="PageTitleCommEvents"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="CommunicationEventAndProduct" list="communicationEvents"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> </entity-and> </actions> <widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml?rev=1170469&r1=1170468&r2=1170469&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ProductScreens.xml Wed Sep 14 08:14:45 2011 @@ -30,7 +30,9 @@ under the License. <set field="headerItem" value="products"/> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/> - <set field="productId" from-field="parameters.productId"/> + <set field="productId" from-field="parameters.productId" global="true"/> + <entity-one entity-name="Product" value-field="product"/> + <set field="product" from-field="product" global="true"/> </actions> <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> @@ -126,8 +128,6 @@ under the License. <set field="tabButtonItem" value="EditProduct"/> <set field="labelTitleProperty" value="ProductProduct"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <set field="parameters.bypassIfNoProduct" value="true"/> </actions> <widgets> @@ -177,10 +177,8 @@ under the License. <set field="tabButtonItem" value="EditProductPrices"/> <set field="labelTitleProperty" value="ProductPrices"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductPrice" list="productPrices"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <order-by field-name="productStoreGroupId"/> <order-by field-name="productPricePurposeId"/> <order-by field-name="productPriceTypeId"/> @@ -214,7 +212,6 @@ under the License. <set field="labelTitleProperty" value="ProductAgreements"/> <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-condition entity-name="SupplierProduct" list="supplierProductAgreements"> <condition-list> <condition-expr field-name="productId" from-field="productId"/> @@ -262,11 +259,8 @@ under the License. <set field="tabButtonItem" value="EditProductCategories"/> <set field="labelTitleProperty" value="ProductCategoryMembers"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductCategoryMember" list="productCategoryMembers"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="sequenceNum"/> <order-by field-name="productCategoryId"/> </entity-condition> @@ -407,7 +401,6 @@ under the License. <set field="productAssocTypeId" value="MANUF_COMPONENT"/> <set field="workEffortGoodStdTypeId" value="ROU_PROD_TEMPLATE"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAssoc" list="components"> <field-map field-name="productId"/> <field-map field-name="productAssocTypeId"/> @@ -454,7 +447,6 @@ under the License. <!-- default currency in framework/common/config/general.properties --> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="CostComponent" value-field="costComponent" auto-field-map="false"> <field-map field-name="costComponentId" from-field="productCostComponentId"/> </entity-one> @@ -521,7 +513,6 @@ under the License. <set field="labelTitleProperty" value="ProductQuickAddVariants"/> <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/QuickAddVariants.groovy"/> </actions> @@ -545,9 +536,6 @@ under the License. <set field="tabButtonItem" value="EditProductQuickAdmin"/> <set field="labelTitleProperty" value="ProductQuickAdmin"/> - <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/EditProductQuickAdmin.groovy"/> </actions> <widgets> @@ -573,11 +561,8 @@ under the License. <set field="tabButtonItem" value="EditProductFacilities"/> <set field="labelTitleProperty" value="ProductFacilities"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacility" list="productFacilities"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="facilityId"/> </entity-condition> <entity-condition entity-name="Facility" list="facilities"> @@ -605,11 +590,8 @@ under the License. <set field="tabButtonItem" value="EditProductFacilityLocations"/> <set field="labelTitleProperty" value="ProductFacilityLocations"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductFacilityLocation" list="productFacilityLocations"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="facilityId"/> <order-by field-name="locationSeqId"/> </entity-condition> @@ -713,10 +695,8 @@ under the License. <set field="tabButtonItem" value="EditProductGoodIdentifications"/> <set field="labelTitleProperty" value="ProductGoodIdentification"/> - <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" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="goodIdentificationTypeId"/> <order-by field-name="idValue"/> </entity-condition> @@ -745,11 +725,8 @@ under the License. <set field="tabButtonItem" value="EditProductGlAccounts"/> <set field="labelTitleProperty" value="ProductGlAccounts"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductGlAccount" list="productGlAccounts"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="glAccountTypeId"/> </entity-condition> <entity-condition entity-name="GlAccountType" list="productGlAccountTypes" use-cache="true"> @@ -795,11 +772,8 @@ under the License. <set field="tabButtonItem" value="EditProductPaymentMethodTypes"/> <set field="labelTitleProperty" value="ProductPaymentTypes"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductPaymentMethodType" list="productPaymentMethodTypes"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="productPricePurposeId"/> <order-by field-name="paymentMethodTypeId"/> <order-by field-name="fromDate"/> @@ -828,7 +802,6 @@ under the License. <set field="labelTitleProperty" value="ProductFeatures"/> <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="featureInteractions"> <field-map field-name="productId" from-field="parameters.productId"/> @@ -873,9 +846,6 @@ under the License. <!-- default currency in framework/common/config/general.properties --> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> - <set field="productId" from-field="parameters.productId"/> - <set field="orderBy" from-field="parameters.orderBy" default-value="partyId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-one entity-name="SupplierProduct" value-field="supplierProduct" auto-field-map="true"/> </actions> <widgets> @@ -907,9 +877,10 @@ under the License. <set field="tabButtonItem" value="EditProductContent"/> <set field="labelTitleProperty" value="ProductContent"/> + <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> + <set field="productId" from-field="parameters.productId"/> <entity-one entity-name="Product" value-field="product"/> - <set field="layoutSettings.javaScripts[]" value="/ecommerce/images/productAdditionalView.js" global="true"/> <script location="component://product/webapp/catalog/WEB-INF/actions/product/EditProductContent.groovy"/> </actions> <widgets> @@ -976,10 +947,8 @@ under the License. <set field="tabButtonItem" value="EditProductAttributes"/> <set field="labelTitleProperty" value="ProductAttributes"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="ProductAttribute" list="productAttributes"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> <order-by field-name="attrType"/> <order-by field-name="attrName"/> </entity-and> @@ -1005,8 +974,6 @@ under the License. <set field="tabButtonItem" value="EditProductAssoc"/> <set field="labelTitleProperty" value="ProductAssociations"/> - <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/EditProductAssoc.groovy"/> </actions> <widgets> @@ -1115,7 +1082,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductMaintenance"/> <set field="labelTitleProperty" value="ProductMaintenance"/> <set field="tabButtonItem" value="EditProductMaints"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1137,7 +1103,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductMeters"/> <set field="labelTitleProperty" value="ProductMeters"/> <set field="tabButtonItem" value="EditProductMeters"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1158,7 +1123,6 @@ under the License. <actions> <set field="titleProperty" value="PageTitleEditProductGeos"/> <set field="tabButtonItem" value="EditProductGeos"/> - <set field="productId" from-field="parameters.productId"/> <set field="labelTitleProperty" value="ProductGeos"/> </actions> <widgets> @@ -1182,7 +1146,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductSubscriptionResources"/> <set field="tabButtonItem" value="EditProductSubscriptionResources"/> <set field="labelTitleProperty" value="ProductSubscriptionResources"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1205,7 +1168,6 @@ under the License. <set field="titleProperty" value="PageTitleEditProductWorkEffort"/> <set field="tabButtonItem" value="EditProductWorkEfforts"/> <set field="labelTitleProperty" value="ProductWorkEffort"/> - <set field="productId" from-field="parameters.productId"/> </actions> <widgets> <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}"> @@ -1249,11 +1211,8 @@ under the License. <set field="tabButtonItem" value="EditProductParties"/> <set field="labelTitleProperty" value="PartyParties"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> - <entity-condition entity-name="ProductRole" list="productRoles"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> <order-by field-name="roleTypeId"/> <order-by field-name="partyId"/> </entity-condition> @@ -1282,9 +1241,8 @@ under the License. <set field="tabButtonItem" value="EditVendorProduct"/> <set field="labelTitleProperty" value="PartyVendor"/> - <set field="productId" from-field="parameters.productId"/> <entity-condition entity-name="VendorProduct" list="vendorProductList"> - <condition-expr field-name="productId" from-field="productId"/> + <condition-expr field-name="productId" from-field="parameters.productId"/> </entity-condition> </actions> <widgets> @@ -1333,6 +1291,7 @@ under the License. <section> <actions> <set field="titleProperty" value="PageTitleViewProductOrders"/> + <set field="tabButtonItem" value="viewProductOrder"/> <set field="labelTitleProperty" value="OrderOrders"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/order/FindOrders.groovy"/> </actions> @@ -1353,10 +1312,8 @@ under the License. <set field="titleProperty" value="PageTitleCommEvents"/> <set field="tabButtonItem" value="EditProductCommunicationEvents"/> <set field="labelTitleProperty" value="PageTitleCommEvents"/> - <set field="productId" from-field="parameters.productId"/> - <entity-one entity-name="Product" value-field="product"/> <entity-and entity-name="CommunicationEventAndProduct" list="communicationEvents"> - <field-map field-name="productId"/> + <field-map field-name="productId" from-field="parameters.productId"/> </entity-and> </actions> <widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |