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

IDEMPIERE-1935:in changepassword window, push "enter" key make waiting window never end

This commit is contained in:
hieplq 2014-05-07 02:25:49 +08:00
parent 9f24e8a85b
commit 7aa1fe51b2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/ChangePasswordPanel.java
View File

@ -45,6 +45,7 @@ import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Tr; import org.zkoss.zhtml.Tr;
import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Image; import org.zkoss.zul.Image;
/** /**
@ -274,6 +275,7 @@ public class ChangePasswordPanel extends Window implements EventListener<Event>
public void validateChangePassword() public void validateChangePassword()
{ {
Clients.clearBusy();
String oldPassword = txtOldPassword.getValue(); String oldPassword = txtOldPassword.getValue();
String newPassword = txtNewPassword.getValue(); String newPassword = txtNewPassword.getValue();
String retypeNewPassword = txtRetypeNewPassword.getValue(); String retypeNewPassword = txtRetypeNewPassword.getValue();

10
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/LoginWindow.java
View File

@ -153,14 +153,20 @@ public class LoginWindow extends FWindow implements EventListener<Event>
if (rolePanel != null) if (rolePanel != null)
{ {
rolePanel.validateRoles(); rolePanel.validateRoles();
return;
} }
else
{
LoginPanel loginPanel = (LoginPanel)this.getFellowIfAny("loginPanel"); LoginPanel loginPanel = (LoginPanel)this.getFellowIfAny("loginPanel");
if (loginPanel != null) if (loginPanel != null)
{ {
loginPanel.validateLogin(); loginPanel.validateLogin();
return;
} }
ChangePasswordPanel changePasswordPanel = (ChangePasswordPanel)this.getFellowIfAny("changePasswordPanel");
if (changePasswordPanel != null){
changePasswordPanel.validateChangePassword();
return;
} }
} }
} }