svn commit: r1335345 - in /ofbiz/branches/release11.04: ./ applications/product/widget/catalog/StoreScreens.xml

Author: jleroux
Date: Tue May  8 05:58:41 2012
New Revision: 1335345

URL: http://svn.apache.org/viewvc?rev=1335345&view=rev
Log:
"Applied fix from trunk for revision: 1335343  "
------------------------------------------------------------------------
r1335343 | jleroux | 2012-05-08 07:56:32 +0200 (mar., 08 mai 2012) | 13 lines

A patch from Tom Burns for "Catalog Edit Product Store Promos List Not Displayed" https://issues.apache.org/jira/browse/OFBIZ-4859

Promotion list not displayed in trunk.
To duplicate:
Open Catalog Manager
Select Stores > Store Id 9000 > Promos

Expected: List of Promotions in the "Edit Product Store Promos" section.

Actual: No records in list.

Note: There is no component "Catalog" in the issue field Component/s drop above.

------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1335343

Modified: ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml?rev=1335345&r1=1335344&r2=1335345&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/branches/release11.04/applications/product/widget/catalog/StoreScreens.xml Tue May  8 05:58:41 2012
@@ -110,6 +110,10 @@ under the License.
 
                 <set field="userEntered" from-field="parameters.userEntered"/>
                 <set field="activeOnly" from-field="parameters.activeOnly" default-value="true"/>
+                
+                <set field="productStoreId" from-field="parameters.productStoreId"/>
+                <entity-one entity-name="ProductStore" value-field="productStore" auto-field-map="true"/>                
+                
                 <entity-condition entity-name="ProductStorePromoAndAppl" list="productStorePromoAndAppls" filter-by-date="${activeOnly}">
                     <condition-list combine="and">
                         <condition-expr field-name="userEntered" from-field="userEntered" ignore-if-empty="true"/>