Author: glandais Date: 2008-03-21 16:52:29 +0000 (Fri, 21 Mar 2008) New Revision: 1442 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java Log: Security entities Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-21 16:52:18 UTC (rev 1441) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-03-21 16:52:29 UTC (rev 1442) @@ -124,15 +124,13 @@ * @throws SimExplorerException the sim explorer exception */ public Object onSuccess() throws SimExplorerException { - Collection<Actor> members = new ArrayList<Actor>(); - members.addAll(usersInGroup); - members.addAll(groupsInGroup); - group.setMembers(members); - if (group.getActorId() == null) { group = RemoteSecurityService.getAuthentificationService().saveGroup(getToken(), group.getName()); } else { - group = RemoteSecurityService.getAuthentificationService().updateGroup(getToken(), group); + Collection<Actor> members = new ArrayList<Actor>(); + members.addAll(usersInGroup); + members.addAll(groupsInGroup); + group = RemoteSecurityService.getAuthentificationService().updateGroup(getToken(), group, members); } return groupList; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-21 16:52:18 UTC (rev 1441) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-03-21 16:52:29 UTC (rev 1442) @@ -20,7 +20,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.apache.tapestry.ComponentResources; import org.apache.tapestry.ValueEncoder; @@ -58,7 +60,7 @@ /** The groups of user. */ @Persist - private Collection<Group> groupsOfUser; + private List<Group> groupsOfUser; /** The group encoder. */ @Persist @@ -121,7 +123,8 @@ if (userId == -1) { this.user = new User(); } else { - groupsOfUser = getUserLogged().getMemberOf(); + this.user = RemoteSecurityService.getAuthentificationService().getUser(getToken(), userId); + groupsOfUser.addAll(this.user.getMemberOf()); } groupEncoder = new GroupValueEncoder(getToken()); } @@ -152,7 +155,9 @@ user.getMail()); return this; } - user.setMemberOf(groupsOfUser); + Set<Group> groups = new HashSet<Group>(); + groups.addAll(groupsOfUser); + user.setMemberOf(groups); user = RemoteSecurityService.getAuthentificationService().updateUser(getToken(), user); return userList; } @@ -272,7 +277,7 @@ * * @return the groups of user */ - public Collection<Group> getGroupsOfUser() { + public List<Group> getGroupsOfUser() { return groupsOfUser; }