[ofbiz-framework] branch trunk updated: Fixed: content/control/WebSiteCms?webSiteId=CmsSite fails (OFBIZ-11266)

[jleroux]

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 2af7119  Fixed: content/control/WebSiteCms?webSiteId=CmsSite fails 
(OFBIZ-11266)
     new 6f5924c  Merge branch 'trunk' of 
https://gitbox.apache.org/repos/asf/ofbiz-framework into trunk
2af7119 is described below

commit 2af71198d45b43e0db265592701c2709b30c83ac
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Mon Nov 4 15:24:23 2019 +0100

    Fixed: content/control/WebSiteCms?webSiteId=CmsSite fails
    (OFBIZ-11266)
    
    I did not notice that I unintentionally removed a line
    while fixing OFBIZ-11259
---
 .../src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
index 33ca5c0..1a23451 100644
--- 
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
+++ 
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/RequestHandler.java
@@ -206,6 +206,7 @@ public class RequestHandler {
                     && (overrideViewUri == null || 
viewMapMap.containsKey(overrideViewUri) 
                     || ("SOAPService".equals(requestUri) && 
"wsdl".equalsIgnoreCase(req.getQueryString())))){
                 rmaps = requestMapMap.get(requestUri);
+                req.setAttribute("overriddenView", overrideViewUri);
             } else if (defaultRequest != null) {
                 rmaps = requestMapMap.get(defaultRequest);
             } else {