Author: jleroux
Date: Fri Mar 6 17:43:18 2009
New Revision: 751001
URL: http://svn.apache.org/viewvc?rev=751001&view=rev
Log:
Reverted ad David's demand but the unused update button in Product Suppliers
form
Removed:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/event/ServiceVariantsEventHandler.java
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.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=751001&r1=751000&r2=751001&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri
Mar 6 17:43:18 2009
@@ -25,7 +25,6 @@
<owner>Copyright 2001-2008 The Apache Software Foundation</owner>
<handler name="service-multi" type="request"
class="org.ofbiz.webapp.event.ServiceMultiEventHandler"/>
- <handler name="service-variant" type="request"
class="org.ofbiz.webapp.event.ServiceVariantsEventHandler"/>
<handler name="groovy" type="request"
class="org.ofbiz.webapp.event.GroovyEventHandler"/>
<firstvisit></firstvisit>
@@ -537,19 +536,19 @@
</request-map>
<request-map uri="createProductPrice">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="createProductPrice"/>
+ <event type="service" path="" invoke="createProductPrice"/>
<response name="success" type="view" value="EditProductPrices"/>
<response name="error" type="view" value="EditProductPrices"/>
</request-map>
<request-map uri="updateProductPrice">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="updateProductPrice"/>
+ <event type="service" path="" invoke="updateProductPrice"/>
<response name="success" type="view" value="EditProductPrices"/>
<response name="error" type="view" value="EditProductPrices"/>
</request-map>
<request-map uri="deleteProductPrice">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="deleteProductPrice"/>
+ <event type="service" path="" invoke="deleteProductPrice"/>
<response name="success" type="view" value="EditProductPrices"/>
<response name="error" type="view" value="EditProductPrices"/>
</request-map>
@@ -739,19 +738,19 @@
</request-map>
<request-map uri="addProductToCategory">
<security https="true" auth="true"/>
- <event type="service-variant" path=""
invoke="safeAddProductToCategory"/>
+ <event type="service" path="" invoke="safeAddProductToCategory"/>
<response name="success" type="view" value="EditProductCategories"/>
<response name="error" type="view" value="EditProductCategories"/>
</request-map>
<request-map uri="updateProductToCategory">
<security https="true" auth="true"/>
- <event type="service-variant" path=""
invoke="updateProductToCategory"/>
+ <event type="service" path="" invoke="updateProductToCategory"/>
<response name="success" type="view" value="EditProductCategories"/>
<response name="error" type="view" value="EditProductCategories"/>
</request-map>
<request-map uri="removeProductFromCategory">
<security https="true" auth="true"/>
- <event type="service-variant" path=""
invoke="removeProductFromCategory"/>
+ <event type="service" path="" invoke="removeProductFromCategory"/>
<response name="success" type="view" value="EditProductCategories"/>
<response name="error" type="view" value="EditProductCategories"/>
</request-map>
@@ -2274,7 +2273,7 @@
<request-map uri="EditProductSuppliers"><security https="true"
auth="true"/><response name="success" type="view"
value="EditSupplierProduct"/></request-map>
<request-map uri="createSupplierProduct">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="createSupplierProduct"/>
+ <event type="service" path="" invoke="createSupplierProduct"/>
<response name="success" type="view" value="EditSupplierProduct"/>
<response name="error" type="view" value="EditSupplierProduct"/>
</request-map>
@@ -2286,7 +2285,7 @@
</request-map>
<request-map uri="removeSupplierProduct">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="removeSupplierProduct"/>
+ <event type="service" path="" invoke="removeSupplierProduct"/>
<response name="success" type="view" value="EditSupplierProduct"/>
<response name="error" type="view" value="EditSupplierProduct"/>
</request-map>
@@ -2315,19 +2314,19 @@
<request-map uri="ProductConfigItemArticle"><security https="true"
auth="true"/><response name="success" type="view"
value="ProductConfigItemArticle"/></request-map>
<request-map uri="createProductConfig">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="createProductConfig"/>
+ <event type="service" path="" invoke="createProductConfig"/>
<response name="success" type="view" value="EditProductConfigs"/>
<response name="error" type="view" value="EditProductConfigs"/>
</request-map>
<request-map uri="updateProductConfig">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="updateProductConfig"/>
+ <event type="service" path="" invoke="updateProductConfig"/>
<response name="success" type="view" value="EditProductConfigs"/>
<response name="error" type="view" value="EditProductConfigs"/>
</request-map>
<request-map uri="deleteProductConfig">
<security https="true" auth="true"/>
- <event type="service-variant" path="" invoke="deleteProductConfig"/>
+ <event type="service" path="" invoke="deleteProductConfig"/>
<response name="success" type="view" value="EditProductConfigs"/>
<response name="error" type="view" value="EditProductConfigs"/>
</request-map>
Modified:
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=751001&r1=751000&r2=751001&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
Fri Mar 6 17:43:18 2009
@@ -384,12 +384,6 @@
</entity-options>
</drop-down>
</field>
- <field name="modifyVariants" title="Modify Variants">
- <drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
- </drop-down>
- </field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="UpdateProductPrice" type="list" target="updateProductPrice"
title="" list-name="productPrices"
@@ -477,12 +471,6 @@
<field name="sequenceNum" title="${uiLabelMap.ProductSequenceNum}"
></field>
<field name="quantity" title="${uiLabelMap.ProductQuantity}" ></field>
<field name="comments" ><textarea/></field>
- <field name="modifyVariants" title="Modify Variants">
- <drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
- </drop-down>
- </field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="UpdateProductCategoryMemeber" type="list"
target="updateProductToCategory" title="" list-name="productCategoryMembers"
@@ -832,12 +820,6 @@
<option key="N" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
- <field name="modifyVariants" title="Modify Variants">
- <drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
- </drop-down>
- </field>
<field use-when="supplierProduct == null" name="submitButton"
title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
<field use-when="supplierProduct != null" name="submitButton"
title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
@@ -896,12 +878,6 @@
</entity-options>
</drop-down>
</field>
- <field name="modifyVariants" title="Modify Variants">
- <drop-down allow-empty="false" no-current-selected-key="N">
- <option key="Y" description="${uiLabelMap.CommonY}"/>
- <option key="N" description="${uiLabelMap.CommonN}"/>
- </drop-down>
- </field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"
widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="UpdateProductConfig" type="list" target="updateProductConfig"
title="" list-name="productConfigs"
