midsuit
/
core-jgi
1
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 22:27:23 +08:00
parent 7aa1fe51b2
commit 45ede791a4
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ import org.zkoss.zhtml.Td;
import org.zkoss.zhtml.Tr;
import org.zkoss.zk.ui.event.Event;
import org.zkoss.zk.ui.event.EventListener;
import org.zkoss.zk.ui.util.Clients;
import org.zkoss.zul.Image;
/**
@ -314,10 +315,7 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
{
if (event.getTarget().getId().equals(ConfirmPanel.A_OK))
{
if (txtAnswer != null && txtAnswer.isReadonly())
validateEmail();
else
validateResetPassword();
validate ();
}
else if (event.getTarget().getId().equals(ConfirmPanel.A_CANCEL))
{
@ -326,6 +324,15 @@ public class ResetPasswordPanel extends Window implements EventListener<Event>
}
}
public void validate (){
Clients.clearBusy();
if (txtAnswer != null && txtAnswer.isReadonly())
validateEmail();
else
validateResetPassword();
}
protected void validateEmail()
{
String email = txtEmail.getValue();

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

@ -168,6 +168,12 @@ public class LoginWindow extends FWindow implements EventListener<Event>
changePasswordPanel.validateChangePassword();
return;
}
ResetPasswordPanel resetPasswordPanel = (ResetPasswordPanel)this.getFellowIfAny("resetPasswordPanel");
if (resetPasswordPanel != null){
resetPasswordPanel.validate();
return;
}
}
}