From c8f0e893483d9b36a1334698e80c66be4984c2c8 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 28 Jul 2008 02:01:51 +0000
Subject: [PATCH] * Temporary workaround for p_adempieresys flag issue, make
 sure it is off after startup. * Selected warehouse not captured into context
 after login.

---
 zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java  | 3 ++-
 .../WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
index 7d95f1a80b..2cc9246f8b 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
@@ -254,6 +254,7 @@ public class RolePanel extends Window implements EventListener
             {
                 for(int i = 0; i < warehouseKNPairs.length; i++)
                     lstWarehouse.appendItem(warehouseKNPairs[i].getName(), warehouseKNPairs[i].getID());
+                lstWarehouse.setSelectedIndex(0);
             }
         }
     }
@@ -300,7 +301,7 @@ public class RolePanel extends Window implements EventListener
         Listitem lstItemRole = lstRole.getSelectedItem();
         Listitem lstItemClient = lstClient.getSelectedItem();
         Listitem lstItemOrg = lstOrganisation.getSelectedItem();
-        Listitem lstItemWarehouse = lstOrganisation.getSelectedItem();
+        Listitem lstItemWarehouse = lstWarehouse.getSelectedItem();
 
         if(lstItemRole == null || lstItemRole.getValue() == null)
         {
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
index f1bc3bfd84..2800378d5b 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
@@ -36,6 +36,7 @@ import org.compiere.report.ReportStarter;
 import org.compiere.util.CLogMgt;
 import org.compiere.util.CLogger;
 import org.compiere.util.Env;
+import org.compiere.util.Ini;
 import org.zkoss.zk.ui.http.DHtmlLayoutServlet;
 
 /**
@@ -82,6 +83,9 @@ public class WebUIServlet extends DHtmlLayoutServlet
         {
             throw new ServletException("Could not start ADempiere");
         }
+        
+        // hengsin: temporary solution for problem with zk client
+        Ini.setProperty(Ini.P_ADEMPIERESYS, false);
         ReportCtl.setReportViewerProvider(new ZkReportViewerProvider());
         ReportStarter.setReportViewerProvider(new ZkJRViewerProvider());
         logger.info("ADempiere started successfully");