* 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:
parent
8c3073d498
commit
c8f0e89348
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in New Issue