Always commit user transactions on save when modifying the security model via the UI

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / src / org / argeo / security / ui / admin / internal / commands / DeleteGroups.java

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
index 868aa0fc7f6a3239ad5591f1b2cb315d63f4b94b..df5d430abd1fad48dee70330d558819dec39c415 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/commands/DeleteGroups.java
@@ -71,10 +71,8 @@ public class DeleteGroups extends AbstractHandler {
                UserAdmin userAdmin = userAdminWrapper.getUserAdmin();
                IWorkbenchPage iwp = HandlerUtil.getActiveWorkbenchWindow(event)
                                .getActivePage();
-
                for (Group group : groups) {
                        String groupName = group.getName();
-
                        // TODO find a way to close the editor cleanly if opened. Cannot be
                        // done through the UserAdminListeners, it causes a
                        // java.util.ConcurrentModificationException because disposing the
@@ -82,11 +80,16 @@ public class DeleteGroups extends AbstractHandler {
                        IEditorPart part = iwp.findEditor(new UserEditorInput(groupName));
                        if (part != null)
                                iwp.closeEditor(part, false);
-
                        userAdmin.removeRole(groupName);
+               }
+               userAdminWrapper.commitOrNotifyTransactionStateChange();
+
+               // Update the view
+               for (Group group : groups) {
                        userAdminWrapper.notifyListeners(new UserAdminEvent(null,
                                        UserAdminEvent.ROLE_REMOVED, group));
                }
+
                return null;
        }