svn commit: r1175161 - in /ofbiz/branches/release10.04: ./ applications/product/widget/catalog/ProductScreens.xml

Author: jleroux
Date: Sat Sep 24 11:43:07 2011
New Revision: 1175161

URL: http://svn.apache.org/viewvc?rev=1175161&view=rev
Log:
"Applied fix from trunk for revision: 1170469"
------------------------------------------------------------------------
r1170469 | sascharodekamp | 2011-09-14 10:14:45 +0200 (mer., 14 sept. 2011) | 1 line

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/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Sep 24 11:43:07 2011
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1053722,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,107520
 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094007,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158126,1159080,1163036,1163093,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1172213,1172243,1174964,1175135,1175143
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,943843,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985298,985473,985718,985856,985902,987841,989166,990127,990
 339,990539,991485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960,1028053,1028625,1028627,1029600,1030016,1030385,1030390,1033928,1033953,1034138,1034179,1035080,1035084,1036426,1036669,1037507,1037559-1037560,1037567,1037883,1038228,1038990,1039256,1040044,1040091,1042009,1042034,1042038,1042132,1042188,1042222,1042317,1042348,1042396,1042411,1042950,1043861,1043996-1043998,1044047,1044084,1044912,1049031,1050602,1051111,1051450,1051812,1052195,1053285,1053289,1053722,1054565,1055057,1056072,1056305,1056803,1057519,1058028,1058056,1058488,1059180,1060236,1060261,1060368,1060933,1061167,1061307,1061346,1061886,1061939,1062138,1062144,1062152,1063273,1064090,1064953,1064993,1065550,1066048,1067097,1067942,1069597,1069965,1070193,1070229,1072017,1072378,1074624,107520
 5,1075952,1076027,1076115,1080218,1080959,1083144,1084572,1084671,1084689,1084855,1085697,1085774,1090952,1090961,1090964,1092479,1094007,1094126,1096441,1098063,1104423,1131144,1132589,1132749,1134649,1134990,1135199,1135686,1137201,1137435,1139346,1139385,1139504,1140358,1140362,1140375,1140469,1144537,1144791,1153768,1158126,1159080,1163036,1163093,1165130,1166591,1167116,1167314,1167480,1167501,1167510,1167517,1167606,1170469,1172213,1172243,1174964,1175135,1175143

Modified: ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml?rev=1175161&r1=1175160&r2=1175161&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml (original)
+++ ofbiz/branches/release10.04/applications/product/widget/catalog/ProductScreens.xml Sat Sep 24 11:43:07 2011
@@ -29,7 +29,9 @@ under the License.
             <actions>
                 <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}">
@@ -115,8 +117,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"/>
             </actions>
             <widgets>
                 <decorator-screen name="CommonProductDecorator" location="${parameters.productDecoratorLocation}">
@@ -171,10 +171,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"/>
@@ -207,7 +205,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"/>
@@ -255,11 +252,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>
@@ -400,7 +394,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"/>
@@ -447,7 +440,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>
@@ -514,7 +506,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>
@@ -538,9 +529,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>
@@ -566,11 +554,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">
@@ -598,11 +583,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>
@@ -706,10 +688,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>
@@ -738,11 +718,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">
@@ -794,11 +771,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"/>
@@ -827,7 +801,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"/>
@@ -872,9 +845,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-and entity-name="SupplierProduct" list="productSuppliers">
                     <field-map field-name="productId"/>
                     <order-by field-name="${orderBy}"/>
@@ -910,9 +880,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>
@@ -978,10 +949,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>
@@ -1007,8 +976,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>
@@ -1117,7 +1084,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}">
@@ -1139,7 +1105,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}">
@@ -1160,7 +1125,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>
@@ -1184,7 +1148,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}">
@@ -1207,7 +1170,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}">
@@ -1251,11 +1213,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>
@@ -1285,9 +1244,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>
@@ -1335,6 +1293,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>
@@ -1355,10 +1314,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>