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

IDEMPIERE-1937:zk7: NPE when click cancel from screen "change role" when login and "forget password"

This commit is contained in:
hieplq 2014-10-23 11:49:19 +07:00
parent 21cf6fc9c5
commit 91de1b4358
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ResetPasswordPanel.java
View File

@ -320,7 +320,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL)) else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
{ {
SessionManager.logoutSession(); SessionManager.logoutSession();
wndLogin.loginCancelled(); //wndLogin.loginCancelled();
} }
} }
@ -490,7 +490,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
@Override @Override
public void onCallback(Integer result) { public void onCallback(Integer result) {
SessionManager.logoutSession(); SessionManager.logoutSession();
wndLogin.loginCancelled(); //wndLogin.loginCancelled();
} }
}); });

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java
View File

@ -535,13 +535,13 @@ public class RolePanel extends Window implements EventListener<Event>, Deferrabl
} else { } else {
ctxBeforeChangeRole = null; ctxBeforeChangeRole = null;
SessionManager.logoutSession(); SessionManager.logoutSession();
wndLogin.loginCancelled(); //wndLogin.loginCancelled();
} }
} }
else if (ON_DEFER_LOGOUT.equals(event.getName())) else if (ON_DEFER_LOGOUT.equals(event.getName()))
{ {
SessionManager.logoutSession(); SessionManager.logoutSession();
wndLogin.loginCancelled(); //wndLogin.loginCancelled();
} }
} }