Skip to content

Commit

Permalink
terminado [#64267916]
Browse files Browse the repository at this point in the history
  • Loading branch information
const3 committed Feb 4, 2014
1 parent 731b2c0 commit 1f756c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3103,5 +3103,6 @@ public class Constantes {
public static final String PATH_JEFESECCION_CREA = "/rh/catalogo/jefeSeccion/crea";
public static final String PATH_JEFESECCION_ACTUALIZA = "/rh/catalogo/jefeSeccion/actualiza";
public static final String PATH_JEFESECCION_ELIMINA = "/rh/catalogo/jefeSeccion/elimina";
public static final String PATH_TRASPASDODATOSEMPLEADO = "/rh/empleado/traspasoDatosEmpleado";

}
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ public Empleado graba(Empleado empleado, Usuario usuario, ClaveEmpleado clave) {
empleado.setEmpresa(usuario.getEmpresa());
empleado.setAlmacen(usuario.getAlmacen());
}
usuario.setPassword(passwordEncoder.encodePassword(
usuario.getPassword(), usuario.getUsername()));
empleado.setPassword(passwordEncoder.encodePassword(
empleado.getPassword(), empleado.getUsername()));
session.saveOrUpdate(empleado);
// session.merge(empleado);
session.flush();
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/logback.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<logger name="org.springframework.security" level="ERROR"/>
<logger name="org.springframework.webflow" level="ERROR"/>

<logger name="org.hibernate" level="ERROR"/>
<logger name="org.hibernate.SQL" level="ERROR"/>
<logger name="org.hibernate" level="TRACE"/>
<logger name="org.hibernate.SQL" level="DEBUG"/>
<logger name="org.hibernate.type" level="ERROR"/>
<logger name="org.hibernate.engine.transaction" level="ERROR"/>

Expand Down

0 comments on commit 1f756c0

Please sign in to comment.