You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2019/11/04 15:00:14 UTC

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

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 <ja...@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 {

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

Posted by Jacques Le Roux <ja...@les7arts.com>.
Le 04/11/2019 à 23:28, Mathieu Lirzin a écrit :
> git config --global pull.rebase true

Thanks Mathieu,

Done :)

Jacques

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

Posted by Mathieu Lirzin <ma...@nereide.fr>.
Hello Jacques,

jleroux@apache.org writes:

> 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

In order to avoid unnecessary merge commits, I would recommend using
‘git pull --rebase’ instead of ‘git pull’

If you don't want to be bother with the extra ‘--rebase’ argument you
can configure git to automatically rebase instead of merge when doing
‘git pull’ with:

    git config --global pull.rebase true

HTH,

-- 
Mathieu Lirzin
GPG: F2A3 8D7E EB2B 6640 5761  070D 0ADE E100 9460 4D37