Author: mor
Date: Mon Mar 14 06:41:11 2011
New Revision: 1081269
URL: http://svn.apache.org/viewvc?rev=1081269&view=rev
Log:
Merged from trunk r1081268. Log:Bug fix - The system should display the Edit
screen when user sucessfully add a new price rule.applications/product/webapp/
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy?rev=1081269&r1=1081268&r2=1081269&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/actions/price/EditProductPriceRules.groovy
Mon Mar 14 06:41:11 2011
@@ -20,6 +20,11 @@
import org.ofbiz.entity.condition.*
String priceRuleId = request.getParameter("productPriceRuleId");
+
+if (!priceRuleId) {
+ priceRuleId = parameters.get("productPriceRuleId");
+}
+
if (priceRuleId) {
context.productPriceRule = delegator.findOne("ProductPriceRule",
[productPriceRuleId : priceRuleId], false);
}
Modified:
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1081269&r1=1081268&r2=1081269&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++
ofbiz/branches/release10.04/applications/product/webapp/catalog/WEB-INF/controller.xml
Mon Mar 14 06:41:11 2011
@@ -1791,7 +1791,7 @@ under the License.
<request-map uri="createProductPriceRule">
<security https="true" auth="true"/>
<event type="service" path="" invoke="createProductPriceRule"/>
- <response name="success" type="view" value="FindPriceRules"/>
+ <response name="success" type="view" value="EditProductPriceRules"/>
<response name="error" type="view" value="FindPriceRules"/>
</request-map>
<request-map uri="updateProductPriceRule">
