Author: jleroux
Date: Fri Sep 9 17:55:43 2011
New Revision: 1167314
URL: http://svn.apache.org/viewvc?rev=1167314&view=rev
Log:
A patch from Atul Vani "Removed redundant controller entries from
product>catalog" https://issues.apache.org/jira/browse/OFBIZ-4401
Removes redundant controller entries from product component's catalog webapp.
Moves one of the entries, so that related entries be all together. Those
entries were exactly same, except for '<request-map
uri="updateCategoryContent">' for which the removed entry had '<event
type="service" path="" invoke="updateCategory"/>', but there exists no service
with name 'updateCategory', the other entry has 'updateProductCategory' service
called in it's event.
Modified:
ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.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=1167314&r1=1167313&r2=1167314&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Fri
Sep 9 17:55:43 2011
@@ -344,52 +344,6 @@ under the License.
<response name="error" type="view" value="EditCategoryParties"/>
</request-map>
- <!-- ================ Category Content Requests ================= -->
- <request-map uri="EditCategoryContent">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- </request-map>
- <request-map uri="updateCategoryContent">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateCategory"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- <response name="error" type="view" value="EditCategoryContent"/>
- </request-map>
-
- <!-- ================ Category Content Assoc Requests ================= -->
- <request-map uri="EditCategoryContentContent">
- <security https="true" auth="true"/>
- <response name="success" type="view"
value="EditCategoryContentContent"/>
- </request-map>
- <request-map uri="prepareAddContentToCategory">
- <security https="true" auth="true"/>
- <response name="success" type="view"
value="EditCategoryContentContent"/>
- </request-map>
- <request-map uri="addContentToCategory">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="createCategoryContent"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- <response name="error" type="view" value="EditCategoryContent"/>
- </request-map>
- <request-map uri="updateContentToCategory">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="updateCategoryContent"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- <response name="error" type="view" value="EditCategoryContent"/>
- </request-map>
- <request-map uri="removeContentFromCategory">
- <security https="true" auth="true"/>
- <event type="service" path="" invoke="removeCategoryContent"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- <response name="error" type="view" value="EditCategoryContent"/>
- </request-map>
- <request-map uri="createSimpleTextContentForAlternateLocaleInCategory">
- <security https="true" auth="true"/>
- <event type="service" path=""
invoke="createSimpleTextContentForAlternateLocale"/>
- <response name="success" type="view" value="EditCategoryContent"/>
- <response name="error" type="view" value="EditCategoryContentContent"/>
- </request-map>
-
<!-- ================ Product Category Attribute Requests
================= -->
<request-map uri="EditCategoryAttributes">
<security https="true" auth="true"/>
@@ -674,6 +628,12 @@ under the License.
<response name="success" type="view" value="EditProductContent"/>
<response name="error" type="view" value="EditProductContentContent"/>
</request-map>
+ <request-map uri="createSimpleTextContentForAlternateLocaleInCategory">
+ <security https="true" auth="true"/>
+ <event type="service" path=""
invoke="createSimpleTextContentForAlternateLocale"/>
+ <response name="success" type="view" value="EditCategoryContent"/>
+ <response name="error" type="view" value="EditCategoryContentContent"/>
+ </request-map>
<!-- ================ Product Content Assoc Requests ================= -->
<request-map uri="EditProductContentContent">
@@ -2879,10 +2839,6 @@ under the License.
<response name="success" type="view" value="viewPreviewImage"/>
<response name="error" type="view" value="viewPreviewImage"/>
</request-map>
- <request-map uri="LookupProduct">
- <security auth="true" https="true"/>
- <response name="success" type="view" value="LookupProduct"/>
- </request-map>
<request-map uri="LookupImage">
<security https="true" auth="true"/>
<response name="success" type="view" value="LookupImage"/>
