svn commit: r1749741 - in /ofbiz/trunk/applications/product: webapp/catalog/WEB-INF/controller.xml widget/catalog/CategoryScreens.xml

[ashish-18]

Author: ashish
Date: Wed Jun 22 16:57:42 2016
New Revision: 1749741

URL: http://svn.apache.org/viewvc?rev=1749741&view=rev
Log:
Applied patch from jira issue - OFBIZ-7256 - After adding child categories user should remain on the same page.
Thanks Ravi for the contribution.

Modified:
    ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
    ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml

Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1749741&r1=1749740&r2=1749741&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Jun 22 16:57:42 2016
@@ -168,7 +168,7 @@ under the License.
     <request-map uri="updateProductCategoryToCategory">
         <security https="true" auth="true"/>
         <event type="service-multi" path="" invoke="updateProductCategoryToCategory"/>
-        <response name="success" type="request-redirect" value="EditCategoryRollup"/>
+        <response name="success" type="view" value="EditCategoryRollup"/>
         <response name="error" type="view" value="EditCategoryRollup"/>
     </request-map>
     <request-map uri="removeProductCategoryFromCategory">

Modified: ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml?rev=1749741&r1=1749740&r2=1749741&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml (original)
+++ ofbiz/trunk/applications/product/widget/catalog/CategoryScreens.xml Wed Jun 22 16:57:42 2016
@@ -285,7 +285,8 @@ under the License.
                 <set field="titleProperty" value="PageTitleEditCategoryRollup"/>
                 <set field="tabButtonItem" value="EditCategoryRollup"/>
                 <set field="labelTitleProperty" value="ProductRollup"/>
-                <set field="productCategoryId" from-field="parameters.productCategoryId"/>
+                <set field="productCategoryId" from-field="parameters.showProductCategoryId" default-value="${parameters.productCategoryId}"/>
+                <set field="parameters.productCategoryId" from-field="productCategoryId"/>
 
                 <entity-condition entity-name="ProductCategoryRollup" list="currentProductCategoryRollups">
                     <condition-expr field-name="productCategoryId" from-field="productCategoryId"/>