Author: jleroux
Date: Thu May 23 16:36:37 2019
New Revision: 1859800
URL: http://svn.apache.org/viewvc?rev=1859800&view=rev
Log:
Fixed: Replace request-redirect w/ no redirect-param attribute by
request-redirect-noparam
(OFBIZ-9997)
Reverts all the rest from r1816180, and, after reading carefully the code used
for "request-redirect" in RequestHandler (and downward), fixes the
documentation
in site-conf.xsd
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml
Thu May 23 16:36:37 2019
@@ -95,61 +95,61 @@ under the License.
<request-map uri="massApproveOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massChangeOrderApproved"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massProcessOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massProcessOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massHoldOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massHoldOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massCancelOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massCancelOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massCancelRemainingPurchaseOrderItems">
<security https="true" auth="true"/>
<event type="service" path=""
invoke="massCancelRemainingPurchaseOrderItems"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massRejectOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massRejectOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massQuickShipOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massQuickShipOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massPickOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massPickOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massPrintOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massPrintOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
<request-map uri="massCreateFileForOrders">
<security https="true" auth="true"/>
<event type="service" path="" invoke="massCreateFileForOrders"/>
- <response name="success" type="request-redirect-noparam"
value="findorders"/>
+ <response name="success" type="request-redirect" value="findorders"/>
<response name="error" type="view" value="findorders"/>
</request-map>
Modified:
ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml
Thu May 23 16:36:37 2019
@@ -483,7 +483,7 @@ under the License.
<request-map uri="createCustRequest">
<security https="true" auth="true"/>
<event type="service" invoke="createCustRequest"/>
- <response name="success" type="request-redirect-noparam"
value="viewprofile"/>
+ <response name="success" type="request-redirect" value="viewprofile"/>
<response name="error" type="request-redirect" value="viewprofile"/>
</request-map>
<request-map uri="newrequest">
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
Thu May 23 16:36:37 2019
@@ -3076,7 +3076,7 @@ under the License.
<request-map uri="updateProductTag">
<security https="true" auth="true"/>
<event type="service-multi" path="" invoke="updateProductKeyword"/>
- <response name="success" type="request-redirect-noparam"
value="EditProductTag"/>
+ <response name="success" type="request-redirect"
value="EditProductTag"/>
<response name="error" type="view" value="EditProductTag"/>
</request-map>
<!-- end of request mappings -->
Modified:
ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml
Thu May 23 16:36:37 2019
@@ -1147,7 +1147,7 @@ under the License.
<request-map uri="dhlShipmentConfirm">
<security https="true" auth="true"/>
<event type="service" path="" invoke="dhlShipmentConfirm"/>
- <response name="success" type="request-redirect-noparam"
value="EditShipmentRouteSegments"/>
+ <response name="success" type="request-redirect"
value="EditShipmentRouteSegments"/>
<response name="error" type="view" value="EditShipmentRouteSegments"/>
</request-map>
@@ -1168,7 +1168,7 @@ under the License.
<request-map uri="fedexShipmentConfirm">
<security https="true" auth="true"/>
<event type="service" path="" invoke="fedexShipRequest"/>
- <response name="success" type="request-redirect-noparam"
value="EditShipmentRouteSegments"/>
+ <response name="success" type="request-redirect"
value="EditShipmentRouteSegments"/>
<response name="error" type="view" value="EditShipmentRouteSegments"/>
</request-map>
Modified:
ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
(original)
+++
ofbiz/ofbiz-framework/trunk/framework/common/webcommon/WEB-INF/common-controller.xml
Thu May 23 16:36:37 2019
@@ -77,7 +77,7 @@ under the License.
<request-map uri="logout">
<security https="true" auth="true"/>
<event type="java" path="org.apache.ofbiz.webapp.control.LoginWorker"
invoke="logout"/>
- <response name="success" type="request-redirect-noparam" value="main"/>
+ <response name="success" type="request-redirect" value="main"/>
<response name="error" type="view" value="main"/>
</request-map>
<request-map uri="forgotPassword">
Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd?rev=1859800&r1=1859799&r2=1859800&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/ofbiz-framework/trunk/framework/webapp/dtd/site-conf.xsd Thu May 23
16:36:37 2019
@@ -526,7 +526,7 @@ under the License.
<xs:annotation>
<xs:documentation>
Internally chains to another request.
- Automatically redirect all current request
parameters to the new request
+ Automatically redirects all current request
parameters to the new request
</xs:documentation>
</xs:annotation>
</xs:enumeration>
@@ -534,7 +534,8 @@ under the License.
<xs:annotation>
<xs:documentation>
Send a redirect down to the browser telling it
to go to the new request.
- Redirect only mentioned request parameters in
controller.xml, using redirect-param attribute
+ Automatically redirects all current request
parameters to the new request
+ or only redirected parameters specified using
redirect-param attribute.
</xs:documentation>
</xs:annotation>
</xs:enumeration>
