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

IDEMPIERE-358 Login- how to make unique and safe / prevent NPE when filling the client box with garbage

This commit is contained in:
Carlos Ruiz 2012-10-20 10:44:02 -05:00
parent b5252784db
commit 1e7cc19d54
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -344,6 +344,7 @@ public class RolePanel extends Window implements EventListener, Deferrable
private void updateRoleList() private void updateRoleList()
{ {
lstRole.getItems().clear(); lstRole.getItems().clear();
lstRole.setText("");
Comboitem lstItemClient = lstClient.getSelectedItem(); Comboitem lstItemClient = lstClient.getSelectedItem();
if (lstItemClient != null) if (lstItemClient != null)
{ {
@ -387,7 +388,6 @@ public class RolePanel extends Window implements EventListener, Deferrable
lblRole.setVisible(true); lblRole.setVisible(true);
lstRole.setVisible(true); lstRole.setVisible(true);
} }
} }
setUserID(); setUserID();
updateOrganisationList(); updateOrganisationList();
@ -491,7 +491,11 @@ public class RolePanel extends Window implements EventListener, Deferrable
} }
private void setUserID() { private void setUserID() {
if (lstClient.getSelectedItem() != null) {
Env.setContext(m_ctx, "#AD_Client_ID", (String) lstClient.getSelectedItem().getValue()); Env.setContext(m_ctx, "#AD_Client_ID", (String) lstClient.getSelectedItem().getValue());
} else {
Env.setContext(m_ctx, "#AD_Client_ID", (String) null);
}
MUser user = MUser.get (m_ctx, m_userName); MUser user = MUser.get (m_ctx, m_userName);
if (user != null) { if (user != null) {
Env.setContext(m_ctx, "#AD_User_ID", user.getAD_User_ID() ); Env.setContext(m_ctx, "#AD_User_ID", user.getAD_User_ID() );