[OFBiz] SVN: r6954 - trunk/framework/webapp/src/org/ofbiz/webapp/control

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-03-08 20:28:33 -0600 (Wed, 08 Mar 2006)
New Revision: 6954

Modified:
   trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
Log:
Small change to improve handling for a success response of type=none to ignore the view name and just return nothing, letting the event handle it as intended regardless of what is passed in the URL

Modified: trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java
===================================================================
--- trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java	2006-03-08 23:44:59 UTC (rev 6953)
+++ trunk/framework/webapp/src/org/ofbiz/webapp/control/RequestHandler.java	2006-03-09 02:28:33 UTC (rev 6954)
@@ -291,8 +291,8 @@
         String eventReturn = requestManager.getRequestAttribute(requestUri, eventReturnString);
         if (Debug.verboseOn()) Debug.logVerbose("[Response Qualified]: " + eventReturn, module);
 
-        // Set the next view
-        if (eventReturn != null && !"success".equals(eventReturnString)) nextView = eventReturn;
+        // Set the next view (don't use event return if success, default to nextView (which is set to eventReturn later if null); also even if success if it is a type "none" response ignore the nextView, ie use the eventReturn)
+        if (eventReturn != null && (!"success".equals(eventReturnString) || eventReturn.startsWith("none:"))) nextView = eventReturn;
         if (Debug.verboseOn()) Debug.logVerbose("[Event Response Mapping]: " + nextView, module);
 
         // get the previous request info