Do not allow admin to remove himself/herself from system.

ximenesuk · Dec 16, 2013 · 89d4fea · 89d4fea
1 parent d7f98ab
commit 89d4fea
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...nts/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java b/...nts/insight/SRC/org/openmicroscopy/shoola/agents/treeviewer/view/TreeViewerComponent.java
@@ -2007,10 +2007,13 @@ public void setExistingObjects(List objects)
 						    selected.add(experimenter);
 						    //Cannot move guest or root
 						    if ((model.isSystemUser(id, GroupData.GUEST) &&
-						       model.isSystemGroup(groupId, GroupData.GUEST)) ||
-						       (model.isSystemUser(id, GroupData.SYSTEM) &&
-		                       model.isSystemGroup(groupId, GroupData.SYSTEM))) {
+						       model.isSystemGroup(groupId, GroupData.GUEST))) {
 						        immutable.add(experimenter);
+						    } else if (model.isSystemGroup(groupId, GroupData.SYSTEM)) {
+						        if (model.isSystemUser(id, GroupData.SYSTEM) ||
+						                id == userID) {
+						            immutable.add(experimenter);
+						        }
 						    }
 						}
 						if (!ids.contains(experimenter.getId())) {