Changeset 6056

Timestamp:

02/09/10 07:51:05 (6 weeks ago)

Author:

jmoore

Message:

ticket:1776 - Adding call to changePermissions to IAdmin.updateGroup

Location:

trunk/components/server

Files:

• src/ome/logic/AdminImpl.java (modified) (1 diff)
• test/ome/server/itests/perms42/SetGroupPermissionsTest.java (modified) (2 diffs)

trunk/components/server/src/ome/logic/AdminImpl.java

@@ -428 +428 @@
     public void updateGroup(@NotNull
     ExperimenterGroup group) {
+        Permissions p = group.getDetails().getPermissions();
+        if (p != null) {
+            changePermissions(group, p); // ticket:1776 WORKAROUND
+            p = getGroup(group.getId()).getDetails().getPermissions();
+            group.getDetails().setPermissions(p);
+        }
         iUpdate.saveObject(group);
         getBeanHelper().getLogger().info("Updated group info for " + group);

trunk/components/server/test/ome/server/itests/perms42/SetGroupPermissionsTest.java

@@ -45 +45 @@
 
     @Test
+    public void testGroupsCanBeMadeSharedViaUpdateGroup() throws Exception {
+        setup(Permissions.USER_PRIVATE);
+        Image image = fixture.saveImage();
+        ExperimenterGroup group = fixture.group();
+        group.getDetails().setPermissions(Permissions.SHARED);
+        iAdmin.updateGroup(group);
+        assertShared(fixture.group());
+        assertShared(image);
+    }
+
+    @Test
     public void testGroupsCanBeMadeSharedWriteable() throws Exception {
         setup(Permissions.PRIVATE);
@@ -75 +86 @@
         assertPrivate(image);
         assertPrivate(fixture.group());
-
     }