From 063965aaab421add29b87aaf1d5bbc71c88d46ca Mon Sep 17 00:00:00 2001 From: valdevir Date: Wed, 30 Nov 2016 23:19:18 +0000 Subject: [PATCH] fixes bug #8321 git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@63051 d1611594-4594-4d17-8e1d-87c2c4800839 --- .../rjconsultores/ventaboletos/entidad/Usuario.java | 11 +++++++++++ .../ventaboletos/utilerias/ApplicationProperties.java | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java index 623cc55d7..a6d5b48d9 100644 --- a/src/com/rjconsultores/ventaboletos/entidad/Usuario.java +++ b/src/com/rjconsultores/ventaboletos/entidad/Usuario.java @@ -94,6 +94,9 @@ public class Usuario implements Serializable, Authentication, UserDetails { @Temporal(TemporalType.TIMESTAMP) private Date fecContrasena; + @Column(name = "DESCMAC") + private String descMac; + /* Lista de permissoes do usuario */ @Transient private List listClavesPermisos; @@ -404,5 +407,13 @@ public class Usuario implements Serializable, Authentication, UserDetails { public boolean isPermisoClave(String clave) { return listClavesPermisos != null && listClavesPermisos.contains(clave); } + + public String getDescMac() { + return descMac; + } + + public void setDescMac(String descMac) { + this.descMac = descMac; + } } diff --git a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java index cd5859788..66e5bd7af 100644 --- a/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java +++ b/src/com/rjconsultores/ventaboletos/utilerias/ApplicationProperties.java @@ -180,4 +180,9 @@ public class ApplicationProperties { return property.equals("1"); } + public boolean exibirEstacaoCadastroUsuario() { + String property = p.getProperty("exibirEstacaoCadastroUsuario", "0"); + return property.equals("1"); + } + }