Author: jleroux
Date: Thu May 23 16:37:34 2019
New Revision: 1859801
URL: http://svn.apache.org/viewvc?rev=1859801&view=rev
Log:
"Applied fix from trunk for revision: 1859800"
------------------------------------------------------------------------
r1859800 | jleroux | 2019-05-23 18:36:37 +0200 (jeu. 23 mai 2019) | 8 lignes
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/branches/release18.12/ (props changed)
ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/controller.xml
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/controller.xml
ofbiz/ofbiz-framework/branches/release18.12/framework/common/webcommon/WEB-INF/common-controller.xml
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/dtd/site-conf.xsd
Propchange: ofbiz/ofbiz-framework/branches/release18.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 23 16:37:34 2019
@@ -10,4 +10,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796
+/ofbiz/ofbiz-framework/trunk:1849931,1850015,1850023,1850530,1850647,1850685,1850694,1850711,1850914,1850918,1850921,1850948,1850953,1851006,1851013,1851068,1851074,1851130,1851158,1851200,1851224,1851247,1851254,1851315,1851319,1851350,1851353,1851433,1851500,1851805,1851885,1851998,1852503,1852587,1852818,1852882,1853070,1853109,1853691,1853745,1853750,1854306,1854457,1854683,1855078,1855083,1855287,1855371,1855403,1855488,1855492,1855497,1855501,1855898,1856212,1856405,1856455,1856459-1856460,1856484,1856598,1856610,1856613,1856617,1856667,1857088,1857099,1857152,1857154,1857173,1857180,1857213,1857392,1857617,1857692,1857813,1858035,1858092,1858180,1858250,1858256,1858275,1858319,1858347,1858432,1858444,1858483,1858523,1858539,1858965,1858980,1859033,1859055,1859087,1859255,1859263,1859268,1859543,1859571,1859576,1859691,1859694,1859698,1859704,1859708,1859735,1859796,1859800
Modified:
ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/order/webapp/ordermgr/WEB-INF/controller.xml
Thu May 23 16:37:34 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/branches/release18.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/party/webapp/partymgr/WEB-INF/controller.xml
Thu May 23 16:37:34 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/branches/release18.12/applications/product/webapp/catalog/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/catalog/WEB-INF/controller.xml
Thu May 23 16:37:34 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/branches/release18.12/applications/product/webapp/facility/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/applications/product/webapp/facility/WEB-INF/controller.xml
Thu May 23 16:37:34 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/branches/release18.12/framework/common/webcommon/WEB-INF/common-controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/webcommon/WEB-INF/common-controller.xml?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/common/webcommon/WEB-INF/common-controller.xml
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/common/webcommon/WEB-INF/common-controller.xml
Thu May 23 16:37:34 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/branches/release18.12/framework/webapp/dtd/site-conf.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/dtd/site-conf.xsd?rev=1859801&r1=1859800&r2=1859801&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/dtd/site-conf.xsd
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/webapp/dtd/site-conf.xsd
Thu May 23 16:37:34 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>
