Merge pull request 'Espec - Bolivariano - Restauração de senha. fixes bug#AL-4269' (!568) from AL4269_1 into master
Reviewed-on: http://18.235.188.113:3000/adm/VentaBoletosAdm/pulls/568 Reviewed-by: fabio <fabio.faria@rjconsultores.com.br>master 1.94.1
commit
3426f80849
2
pom.xml
2
pom.xml
|
@ -4,7 +4,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>br.com.rjconsultores</groupId>
|
<groupId>br.com.rjconsultores</groupId>
|
||||||
<artifactId>ventaboletosadm</artifactId>
|
<artifactId>ventaboletosadm</artifactId>
|
||||||
<version>1.94.0</version>
|
<version>1.94.1</version>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
|
|
@ -101,7 +101,7 @@ public class LoginController extends MyGenericForwardComposer {
|
||||||
Usuario usuario = usuarioList.get(0);
|
Usuario usuario = usuarioList.get(0);
|
||||||
|
|
||||||
if(StringUtils.isBlank(usuario.getDescCorreo())) {
|
if(StringUtils.isBlank(usuario.getDescCorreo())) {
|
||||||
Messagebox.show(Labels.getLabel("winCambiaContrasena.erro.configuracaoConstante"),
|
Messagebox.show(Labels.getLabel("winCambiaContrasena.erro.emailNaoCadastrado"),
|
||||||
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -113,7 +113,7 @@ public class LoginController extends MyGenericForwardComposer {
|
||||||
Constante urlADM = constanteService.buscarPorNomeConstante(URL_ADM);
|
Constante urlADM = constanteService.buscarPorNomeConstante(URL_ADM);
|
||||||
|
|
||||||
if(isNull(hostSmtp) || isNull(portaSmtp) || isNull(usuarioSmtp) || isNull(senhaUsuarioSMTP) || isNull(urlADM)) {
|
if(isNull(hostSmtp) || isNull(portaSmtp) || isNull(usuarioSmtp) || isNull(senhaUsuarioSMTP) || isNull(urlADM)) {
|
||||||
Messagebox.show(Labels.getLabel("winCambiaContrasena.erro.emailNaoCadastrado"),
|
Messagebox.show(Labels.getLabel("winCambiaContrasena.erro.configuracaoConstante"),
|
||||||
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -128,7 +128,7 @@ public class LoginController extends MyGenericForwardComposer {
|
||||||
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
Labels.getLabel("winCambiaContrasena.title"), Messagebox.OK, Messagebox.INFORMATION);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
log.error("Erro: ", ex);
|
log.error("Erro: ", ex);
|
||||||
Clients.alert(ex.getLocalizedMessage() + " -> " + ex.getStackTrace().toString(), Labels.getLabel("winCambiaContrasena.title"), Messagebox.INFORMATION);
|
Clients.alert(ex.getLocalizedMessage(), Labels.getLabel("winCambiaContrasena.title"), Messagebox.INFORMATION);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue