[OpenbravoERP-commits] devel/pi: Solve failing test case on jenkins

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/b1fde682e407
changeset: 13781:b1fde682e407
user:      Martin Taal <martin.taal <at> openbravo.com>
date:      Sat Sep 17 11:07:37 2011 +0200
summary:   Solve failing test case on jenkins

diffstat:

 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
           |   4 +++
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
 |  11 ++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diffs (48 lines):

diff -r 0e16f6ffa542 -r b1fde682e407 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
    Fri Sep 16 13:33:17 2011 +0200
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelServlet.java
    Sat Sep 17 11:07:37 2011 +0200
@@ -223,6 +223,10 @@
       parameterMap.put(key, request.getParameter(key));
     }
 
+    if (!parameterMap.containsKey(KernelConstants.HTTP_SESSION)) {
+      parameterMap.put(KernelConstants.HTTP_SESSION, request.getSession());
+    }
+
     if (!parameterMap.containsKey(KernelConstants.CONTEXT_URL)) {
       parameterMap.put(KernelConstants.CONTEXT_URL, 
computeContextURL(request));
     }
diff -r 0e16f6ffa542 -r b1fde682e407 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
--- 
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
  Fri Sep 16 13:33:17 2011 +0200
+++ 
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java
  Sat Sep 17 11:07:37 2011 +0200
@@ -25,12 +25,14 @@
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
 import org.openbravo.client.kernel.BaseComponentProvider.ComponentResource;
 import 
org.openbravo.client.kernel.BaseComponentProvider.ComponentResource.ComponentResourceType;
+import org.openbravo.dal.core.OBContext;
 import org.openbravo.model.ad.module.Module;
 import org.openbravo.service.web.WebServiceUtil;
 
@@ -97,6 +99,15 @@
           || !getParameters().get(KernelConstants.MODE_PARAMETER).equals(
               KernelConstants.MODE_PARAMETER_300);
 
+      if (!classicMode) {
+        // note injecting the HttpSession through Weld does not work
+        // as it will instantiate one of the subclasses of HttpSession
+        // defined in the RequestContext
+        ((HttpSession) 
getParameters().get(KernelConstants.HTTP_SESSION)).setAttribute(
+            "#Hide_BackButton".toUpperCase(), "true");
+        OBContext.getOBContext().setNewUI(true);
+      }
+
       StringBuilder result = new StringBuilder();
       if (classicMode) {
         result.append("document.write(\"<LINK rel='stylesheet' type='text/css' 
href='"

------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
http://p.sf.net/sfu/rim-devcon-copy2
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits