Fixing permission strings setActualPermissions()

will-moore · May 4, 2012 · 1eb4e4f · 1eb4e4f
1 parent 0b03752
commit 1eb4e4f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/components/tools/OmeroWeb/omeroweb/webadmin/controller/group.py b/components/tools/OmeroWeb/omeroweb/webadmin/controller/group.py
@@ -220,9 +220,16 @@ def setActualPermissions(self, p, r=None):
             #private
             permissions = PermissionsI("rw----")
         elif p == 1:
-            #read-only
-            permissions = PermissionsI("rwr---")
+            #collab read-only
+            if r:
+                permissions = PermissionsI("rwr---")
+            else:
+                # collab or 'read-annotate' (pre 4.4 this was 'readonly')
+                permissions = PermissionsI("rwra--")
         elif p == 2:
-            #read-annotate (pre 4.4 this was 'readonly')
-            permissions = PermissionsI("rwra--")
+            #public (not supported in current UI)
+            if r:
+                permissions = PermissionsI("rwrw--")
+            else:
+                permissions = PermissionsI("rwr-r-")
         return permissions