midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Temporary workaround for p_adempieresys flag issue, make sure it is off after startup. 

* Selected warehouse not captured into context after login.
This commit is contained in:
Heng Sin Low 2008-07-28 02:01:51 +00:00
parent 8c3073d498
commit c8f0e89348
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zkwebui/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
View File

@ -254,6 +254,7 @@ public class RolePanel extends Window implements EventListener
{ {
for(int i = 0; i < warehouseKNPairs.length; i++) for(int i = 0; i < warehouseKNPairs.length; i++)
lstWarehouse.appendItem(warehouseKNPairs[i].getName(), warehouseKNPairs[i].getID()); 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 lstItemRole = lstRole.getSelectedItem();
Listitem lstItemClient = lstClient.getSelectedItem(); Listitem lstItemClient = lstClient.getSelectedItem();
Listitem lstItemOrg = lstOrganisation.getSelectedItem(); Listitem lstItemOrg = lstOrganisation.getSelectedItem();
Listitem lstItemWarehouse = lstOrganisation.getSelectedItem(); Listitem lstItemWarehouse = lstWarehouse.getSelectedItem();
if(lstItemRole == null || lstItemRole.getValue() == null) if(lstItemRole == null || lstItemRole.getValue() == null)
{ {

4
zkwebui/WEB-INF/src/org/adempiere/webui/session/WebUIServlet.java
View File

@ -36,6 +36,7 @@ import org.compiere.report.ReportStarter;
import org.compiere.util.CLogMgt; import org.compiere.util.CLogMgt;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Ini;
import org.zkoss.zk.ui.http.DHtmlLayoutServlet; import org.zkoss.zk.ui.http.DHtmlLayoutServlet;
/** /**
@ -82,6 +83,9 @@ public class WebUIServlet extends DHtmlLayoutServlet
{ {
throw new ServletException("Could not start ADempiere"); 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()); ReportCtl.setReportViewerProvider(new ZkReportViewerProvider());
ReportStarter.setReportViewerProvider(new ZkJRViewerProvider()); ReportStarter.setReportViewerProvider(new ZkJRViewerProvider());
logger.info("ADempiere started successfully"); logger.info("ADempiere started successfully");