Author: glandais Date: 2008-02-06 17:10:11 +0000 (Wed, 06 Feb 2008) New Revision: 693 Modified: trunk/simexplorer-is-security/src/java/META-INF/orm.xml trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java Log: User security Modified: trunk/simexplorer-is-security/src/java/META-INF/orm.xml =================================================================== --- trunk/simexplorer-is-security/src/java/META-INF/orm.xml 2008-02-06 17:09:53 UTC (rev 692) +++ trunk/simexplorer-is-security/src/java/META-INF/orm.xml 2008-02-06 17:10:11 UTC (rev 693) @@ -17,6 +17,7 @@ <id name="id"> <generated-value strategy="SEQUENCE" /> </id> + <basic name="visible"></basic> <many-to-many name="groups" target-entity="Group" fetch="EAGER"> <cascade> Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-02-06 17:09:53 UTC (rev 692) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-02-06 17:10:11 UTC (rev 693) @@ -86,9 +86,8 @@ */ public void deleteGroup(Integer id) { Group g = getGroup(id); - if (g != null) { - em.remove(g); - } + g.setVisible(false); + em.merge(g); } /* (non-Javadoc) @@ -96,9 +95,8 @@ */ public void deleteUser(Integer id) { User u = getUser(id); - if (u != null) { - em.remove(u); - } + u.setVisible(false); + em.merge(u); } /* (non-Javadoc) Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-02-06 17:09:53 UTC (rev 692) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/entities/Actor.java 2008-02-06 17:10:11 UTC (rev 693) @@ -36,6 +36,9 @@ /** The groups. */ private List<Group> groups; + /** The visible. */ + private boolean visible; + /** * Gets the id. * @@ -56,6 +59,25 @@ } /** + * Checks if is visible. + * + * @return true, if is visible + */ + public boolean isVisible() { + return visible; + } + + /** + * Sets the visible. + * + * @param visible + * the new visible + */ + public void setVisible(boolean visible) { + this.visible = visible; + } + + /** * Gets the groups. * * @return the groups