droideparanoico/myhealth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corregido error al realizar logina (la ventana se agitaba aún con login

Browse Source 
correcto).
This commit is contained in:
Marcos Garcia Nuñez
2019-12-16 15:57:02 +01:00
parent 48c04a6681
commit dcbebe5253
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
1.sources/MyHealth/docroot/header.xhtml
View File

@@ -14,15 +14,16 @@
function handleLoginRequest(xhr, status, args) { function handleLoginRequest(xhr, status, args) {
if(args.validationFailed || !args.loggedIn) { if(args.validationFailed || !args.loggedIn) {
PF('dlgLogin').jq.effect("shake", {times:5}, 100); PF('dlgLogin').jq.effect("shake", {times:5}, 100);
//PF('Login').attr("disabled", false); PF('btnLogin').enable();
} }
else { else {
PF('btnLogin').enable();
PF('dlgLogin').hide(); PF('dlgLogin').hide();
} }
} }
function startLogin() { function startLogin() {
//PF('Login').attr("disabled", true); PF('btnLogin').disable();
} }
</h:outputScript> </h:outputScript>
<h:body> <h:body>
@@ -57,8 +58,7 @@
<p:password id="password" value="#{loginView.password}" /> <p:password id="password" value="#{loginView.password}" />
</div> </div>
<div class="ui-g-6"> <div class="ui-g-6">
<p:commandButton value="Login" update="frmMenu, messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" <p:commandButton widgetVar="btnLogin" value="Login" update="messages" icon="pi pi-sign-in" action="#{loginView.login}" onstart="startLogin()" oncomplete="handleLoginRequest(xhr, status, args)" />
oncomplete="handleLoginRequest(xhr, status, args)" />
</div> </div>
<div class="ui-g-6"> <div class="ui-g-6">
<p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" /> <p:commandButton value="Cancel" icon="pi pi-ban" onclick="PF('dlgLogin').hide();" />

9
1.sources/MyHealth/src/managedbean/systemAdmin/LoginMBean.java
View File

@@ -42,10 +42,11 @@ public class LoginMBean extends ManagedBeanBase {
public String login() { public String login() {
boolean loggedIn = false; boolean loggedIn = false;
String viewRedirect = "";
LoggedUserTO usr = null; LoggedUserTO usr = null;
if (username != null && password != null) { if (username != null && password != null && username.equals("") == false && password.equals("") == false) {
try { try {
usr = this.getRemoteManagerSystemAdmin().login(username, password); usr = this.getRemoteManagerSystemAdmin().login(username, password);
@@ -54,8 +55,7 @@ public class LoginMBean extends ManagedBeanBase {
SessionUtils.CreateSession(usr); SessionUtils.CreateSession(usr);
this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName()); this.addFacesMessageKeep(FacesMessage.SEVERITY_INFO, "Login correcto", "Bienvenido " + usr.getName());
viewRedirect = "/home?faces-redirect=true";
return ("/home?faces-redirect=true");
} else } else
this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos"); this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
} catch (Exception ex) { } catch (Exception ex) {
@@ -66,8 +66,7 @@ public class LoginMBean extends ManagedBeanBase {
this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos"); this.addFacesMessage(FacesMessage.SEVERITY_WARN, "Loggin Error", "El usuario o la contraseña son incorrectos");
PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn); PrimeFaces.current().ajax().addCallbackParam("loggedIn", loggedIn);
return viewRedirect;
return "";
} }
// logout event, invalidate session // logout event, invalidate session