svn commit: r1751489 - in /ofbiz/trunk/applications/product/widget/catalog: StoreForms.xml StoreScreens.xml

[ashish-18]

Author: ashish
Date: Tue Jul  5 14:29:23 2016
New Revision: 1751489

URL: http://svn.apache.org/viewvc?rev=1751489&view=rev
Log:
Applied patch from jira issue - OFBIZ-7361.patch - Catalog : Product Store Group from Product Store Group List item is not being open.
Thanks Rahul and Akshay for the contribution.

Modified:
    ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
    ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml?rev=1751489&r1=1751488&r2=1751489&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreForms.xml Tue Jul  5 14:29:23 2016
@@ -638,7 +638,7 @@ under the License.
         </actions>
         <field name="productStoreGroupId"><hidden/></field>
         <field name="productStoreGroupName">
-            <hyperlink target="ListParentProductStoreGroup" description="${productStoreGroupName} [${productStoreGroupId}]">
+            <hyperlink target="EditProductStoreGroupAndAssoc" description="${productStoreGroupName} [${productStoreGroupId}]">
                 <parameter param-name="productStoreGroupId"/>
             </hyperlink>
         </field>

Modified: ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml?rev=1751489&r1=1751488&r2=1751489&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/StoreScreens.xml Tue Jul  5 14:29:23 2016
@@ -656,5 +656,55 @@ under the License.
             </widgets>
         </section>
     </screen>
+    
+    <screen name="EditProductStoreGroupAndAssoc">
+       <section>
+           <actions>
+               <property-map map-name="uiLabelMap" resource="CommonUiLabels"/>
+               <property-map map-name="uiLabelMap" resource="ProductUiLabels"/>
+               <entity-one entity-name="ProductStoreGroup" value-field="productStoreGroup"/>
+               <set field="isAjaxRequest" value="${groovy: 'XMLHttpRequest'.equals(request.getHeader('X-Requested-With'))}" type="Boolean"/>
+           </actions>
+           <widgets>
+               <section>
+                   <condition>
+                       <if-compare field="isAjaxRequest" operator="equals" value="false" type="Boolean"/>
+                   </condition>
+                   <widgets>
+                       <decorator-screen name="CommonProductStoreGroupDecorator" location="${parameters.mainDecoratorLocation}">
+                           <decorator-section name="body">
+                               <screenlet title="${uiLabelMap.ProductProductStoreGroup} ${productStoreGroup.productStoreGroupName} [${productStoreGroup.productStoreGroupId}]" name="editProductStoreGroup" collapsible="true" initially-collapsed="true">
+                                   <include-form name="EditProductStoreGroup" location="component://product/widget/catalog/StoreForms.xml"/>
+                               </screenlet>
+                               <screenlet title="${uiLabelMap.ProductProductStoreGroupRollup}" id="editProductStoreGroupRollup" name="editProductStoreGroupRollup" collapsible="true" initially-collapsed="true">
+                                   <include-form name="ListProductStoreGroupAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                               </screenlet>
+                               <screenlet title="${uiLabelMap.ProductProductStoreMember}">
+                                   <include-form name="ListProductStoreAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                               </screenlet>
+                               <screenlet title="${uiLabelMap.ProductAddToProductStoreGroup}">
+                                   <include-form name="AddProductStoreAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                               </screenlet>
+                           </decorator-section>
+                       </decorator-screen>
+                   </widgets>
+                   <fail-widgets>
+                      <screenlet title="${uiLabelMap.ProductProductStoreGroup} ${productStoreGroup.productStoreGroupName} [${productStoreGroup.productStoreGroupId}]" name="editProductStoreGroup" collapsible="true" initially-collapsed="true">
+                            <include-form name="EditProductStoreGroup" location="component://product/widget/catalog/StoreForms.xml"/>
+                   </screenlet>
+                        <screenlet title="${uiLabelMap.ProductProductStoreGroupRollup}" id="editProductStoreGroupRollup" name="editProductStoreGroupRollup" collapsible="true" initially-collapsed="true">
+                            <include-form name="ListProductStoreGroupAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.ProductProductStoreMember}">
+                            <include-form name="ListProductStoreAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                        </screenlet>
+                        <screenlet title="${uiLabelMap.ProductAddToProductStoreGroup}">
+                            <include-form name="AddProductStoreAssoc" location="component://product/widget/catalog/StoreForms.xml"/>
+                        </screenlet>
+                    </fail-widgets>
+                </section>
+            </widgets>
+        </section>
+    </screen>
 
 </screens>