X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.ui.admin%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fui%2Fadmin%2Finternal%2Fparts%2FUserMainPage.java;h=db6eb538fe059635393edfa3781e20bb4055c917;hb=8260f4470f514ea347ca53f5b4dfc632c4a4de66;hp=06b430f74920c848d647b460dcc76f67a35279f0;hpb=3400a80f88b418c598bf30f27b13ce1360902376;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
index 06b430f74..db6eb538f 100644
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/parts/UserMainPage.java
@@ -19,15 +19,15 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.CmsException;
 import org.argeo.cms.auth.AuthConstants;
+import org.argeo.cms.util.useradmin.UserAdminUtils;
 import org.argeo.eclipse.ui.ColumnDefinition;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.parts.LdifUsersTable;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.osgi.useradmin.LdifName;
 import org.argeo.security.ui.admin.SecurityAdminImages;
-import org.argeo.security.ui.admin.internal.UserAdminUtils;
 import org.argeo.security.ui.admin.internal.UserAdminWrapper;
 import org.argeo.security.ui.admin.internal.parts.UserEditor.GroupChangeListener;
 import org.argeo.security.ui.admin.internal.parts.UserEditor.MainInfoListener;
@@ -228,7 +228,7 @@ public class UserMainPage extends FormPage implements ArgeoNames {
 						|| !password2.getText().equals("")) {
 					if (password1.getText().equals(password2.getText())) {
 						char[] newPassword = password1.getText().toCharArray();
-						userAdminWrapper.beginTransactionIfNeeded();
+						// userAdminWrapper.beginTransactionIfNeeded();
 						user.getCredentials().put(null, newPassword);
 						password1.setText("");
 						password2.setText("");
@@ -236,7 +236,7 @@ public class UserMainPage extends FormPage implements ArgeoNames {
 					} else {
 						password1.setText("");
 						password2.setText("");
-						throw new ArgeoException("Passwords are not equals");
+						throw new CmsException("Passwords are not equals");
 					}
 				}
 			}
@@ -416,25 +416,17 @@ public class UserMainPage extends FormPage implements ArgeoNames {
 			@SuppressWarnings("unchecked")
 			Iterator<Group> it = ((IStructuredSelection) selection).iterator();
 			List<Group> groups = new ArrayList<Group>();
-			// StringBuilder builder = new StringBuilder();
 			while (it.hasNext()) {
 				Group currGroup = it.next();
-				// String groupName = UserAdminUtils.getUsername(currGroup);
-				// builder.append(groupName).append("; ");
 				groups.add(currGroup);
 			}
 
-			// if (!MessageDialog.openQuestion(
-			// HandlerUtil.getActiveShell(event),
-			// "Re",
-			// "Are you sure that you want to delete these users?\n"
-			// + builder.substring(0, builder.length() - 2)))
-			// return null;
-
 			userAdminWrapper.beginTransactionIfNeeded();
 			for (Group group : groups) {
 				group.removeMember(user);
-				// sectionPart.refresh();
+			}
+			userAdminWrapper.commitOrNotifyTransactionStateChange();
+			for (Group group : groups) {
 				userAdminWrapper.notifyListeners(new UserAdminEvent(null,
 						UserAdminEvent.ROLE_CHANGED, group));
 			}
@@ -475,9 +467,11 @@ public class UserMainPage extends FormPage implements ArgeoNames {
 			// TODO this check should be done before.
 			if (role.getType() == Role.GROUP) {
 				// TODO check if the user is already member of this group
+
 				myUserAdminWrapper.beginTransactionIfNeeded();
 				Group group = (Group) role;
 				group.addMember(myUser);
+				userAdminWrapper.commitOrNotifyTransactionStateChange();
 				myUserAdminWrapper.notifyListeners(new UserAdminEvent(null,
 						UserAdminEvent.ROLE_CHANGED, group));
 			}