svn commit: r744020 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

[jo...@apache.org]

Author: jonesde
Date: Fri Feb 13 07:38:18 2009
New Revision: 744020

URL: http://svn.apache.org/viewvc?rev=744020&view=rev
Log:
Fixed issue reported by Hans Bakker which shows up in the strange situation for the content/views/Xxx URLs because they chain to a request with no event, and that was causing the overrideViewUrl to not get set to be picked up later when it is time to render the view; that is now fixed and the WebSite -> CMS tab is working again in the Content Manager

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java

Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java?rev=744020&r1=744019&r2=744020&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java Fri Feb 13 07:38:18 2009
@@ -423,11 +423,10 @@
         }
 
         ConfigXMLReader.RequestResponse successResponse = requestMap.requestResponseMap.get("success");
-        if ("success".equals(eventReturn) && successResponse != null && "request".equals(successResponse.type)) {
+        if ((eventReturn == null || "success".equals(eventReturn)) && successResponse != null && "request".equals(successResponse.type)) {
             // chains will override any url defined views; but we will save the view for the very end
-            if (nextRequestResponse != null) {
-                // NOTE: possible issue if nextRequestResponse.type != view
-                request.setAttribute("_POST_CHAIN_VIEW_", nextRequestResponse.value);
+            if (UtilValidate.isNotEmpty(overrideViewUri)) {
+                request.setAttribute("_POST_CHAIN_VIEW_", overrideViewUri);
             }
             nextRequestResponse = successResponse;
         }