X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FGroupMainPage.java;h=b6b7d6ecd5640c5bb532b802d723a0f89b4e15d0;hb=98f57ce4987d7a7bfcea4806b20520f1a01830fa;hp=1e6cd4f10564f0cb61fc1bba72b5fcf39967cc9c;hpb=935a76bdd458e4fb8502783946cb910324388da8;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
index 1e6cd4f10..b6b7d6ecd 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/GroupMainPage.java
@@ -388,16 +388,8 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 			String newUserName = (String) event.data;
 			UserAdmin myUserAdmin = userAdminWrapper.getUserAdmin();
 			Role role = myUserAdmin.getRole(newUserName);
-			if (role.getType() == Role.USER) {
-				// TODO check if the group is already member of this group
-				userAdminWrapper.beginTransactionIfNeeded();
-				User user = (User) role;
-				myGroup.addMember(user);
-				userAdminWrapper.notifyListeners(new UserAdminEvent(null,
-						UserAdminEvent.ROLE_CHANGED, myGroup));
-			} else if (role.getType() == Role.GROUP) {
+			if (role.getType() == Role.GROUP) {
 				Group newGroup = (Group) role;
-
 				Shell shell = getViewer().getControl().getShell();
 				// Sanity checks
 				if (myGroup == newGroup) { // Equality
@@ -424,12 +416,18 @@ public class GroupMainPage extends FormPage implements ArgeoNames {
 									+ ", this membership already exists");
 					return;
 				}
-
 				userAdminWrapper.beginTransactionIfNeeded();
 				// TODO implement the dirty state
 				myGroup.addMember(newGroup);
 				userAdminWrapper.notifyListeners(new UserAdminEvent(null,
 						UserAdminEvent.ROLE_CHANGED, myGroup));
+			} else if (role.getType() == Role.USER) {
+				// TODO check if the group is already member of this group
+				userAdminWrapper.beginTransactionIfNeeded();
+				User user = (User) role;
+				myGroup.addMember(user);
+				userAdminWrapper.notifyListeners(new UserAdminEvent(null,
+						UserAdminEvent.ROLE_CHANGED, myGroup));
 			}
 			super.drop(event);
 		}