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

* NPE when login as System Administrator role. 

* [ 1884758 ] webUI not invoking Login ModelValidator.
* Failed to logout.
This commit is contained in:
Heng Sin Low 2008-07-26 23:15:53 +00:00
parent 8ad9490bf8
commit 287e587c29
3 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java
View File

@ -227,10 +227,13 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
borderlayout.setHeight("100%"); borderlayout.setHeight("100%");
borderlayout.setStyle("position: absolute"); borderlayout.setStyle("position: absolute");
East east = new East(); WPAPanel paPanel = WPAPanel.get();
borderlayout.appendChild(east); if (paPanel != null) {
east.appendChild(WPAPanel.get()); East east = new East();
east.setWidth("205px"); borderlayout.appendChild(east);
east.appendChild(paPanel);
east.setWidth("205px");
}
Center center = new Center(); Center center = new Center();
borderlayout.appendChild(center); borderlayout.appendChild(center);
@ -246,27 +249,32 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl
updateInfo(); updateInfo();
new Thread(new Runnable() new Thread(new UpdateInfoRunnable(gbxAct.getDesktop())).start();
{ }
public void run()
{ private class UpdateInfoRunnable implements Runnable {
private org.zkoss.zk.ui.Desktop desktop;
UpdateInfoRunnable(org.zkoss.zk.ui.Desktop desktop) {
this.desktop = desktop;
}
public void run()
{
try {
// get full control of desktop
Executions.activate(desktop);
try { try {
// get full control of desktop updateInfo();
Executions.activate(gbxAct.getDesktop()); Threads.sleep(500);// Update each 0.5 seconds
try { } catch (Error ex) {
updateInfo(); throw ex;
Threads.sleep(500);// Update each 0.5 seconds } finally {
} catch (Error ex) { // release full control of desktop
throw ex; Executions.deactivate(desktop);
} finally {
// release full control of desktop
Executions.deactivate(gbxAct.getDesktop());
}
} catch (Exception e) {
logger.log(Level.WARNING, "Failed to run NRW", e);
} }
} catch (Exception e) {
logger.log(Level.WARNING, "Failed to run NRW", e);
} }
}).start(); }
} }
private Box createActivitiesPanel() private Box createActivitiesPanel()

2
zkwebui/WEB-INF/src/org/adempiere/webui/apps/graph/WPAPanel.java
View File

@ -1,7 +1,5 @@
package org.adempiere.webui.apps.graph; package org.adempiere.webui.apps.graph;
import java.awt.Color;
import org.adempiere.webui.component.Grid; import org.adempiere.webui.component.Grid;
import org.adempiere.webui.component.Panel; import org.adempiere.webui.component.Panel;
import org.adempiere.webui.component.Row; import org.adempiere.webui.component.Row;

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

@ -328,7 +328,14 @@ public class RolePanel extends Window implements EventListener
warehouseKNPair = new KeyNamePair(warehouseId, lstItemWarehouse.getLabel()); warehouseKNPair = new KeyNamePair(warehouseId, lstItemWarehouse.getLabel());
} }
String msg = login.loadPreferences(orgKNPair, warehouseKNPair, null, null); String msg = login.validateLogin(orgKNPair);
if (msg != null && msg.length() > 0)
{
lblErrorMsg.setValue("Error for user login: " + msg);
return;
}
msg = login.loadPreferences(orgKNPair, warehouseKNPair, null, null);
if(!(msg == null || msg.length() == 0)) if(!(msg == null || msg.length() == 0))
{ {
lblErrorMsg.setValue("Error for user login: " + msg); lblErrorMsg.setValue("Error for user login: " + msg);