Changeset 7211

Timestamp:

Oct 19, 2016, 2:08:22 PM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2034: New permission for annotating items

Decoupled the USE and RESTRICTED_WRITE permission from each other. To avoid unexpected problems with the User item, USE permission is explicitely added.

The AnnotationSet now checks for RESTRICTED_WRITE permission instead of WRITE permission on the parent item. This should be enough for allowing a user to handle annotations on the item.

Location:

trunk/src/core/net/sf/basedb/core

Files:

• AnnotationSet.java (modified) (2 diffs)
• Permission.java (modified) (1 diff)
• User.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/AnnotationSet.java

@@ -386 +386 @@
   /**
     READ permission is granted to all users. CREATE, WRITE and DELETE permissions are granted
-    if the logged in user has WRITE permission on the associated item.
+    if the logged in user has RESTRICTED_WRITE permission on the associated item.
   */
   @Override
@@ -399 +399 @@
     catch (PermissionDeniedException ex)
     {}
-    if (item != null && item.hasPermission(Permission.WRITE))
+    if (item != null && item.hasPermission(Permission.RESTRICTED_WRITE))
     {
       granted |= Permission.grant(Permission.CREATE, Permission.READ, Permission.WRITE, Permission.DELETE);       

trunk/src/core/net/sf/basedb/core/Permission.java

@@ -73 +73 @@
     This permission allows a user to use/link to an item.
   */
-  USE(1+2, 2+4+8+16+32, "use"),
+  USE(1+2, 2+8+16+32, "use"),
   
   /**
     This permission allows a user to update some information about an item.
   */
-  RESTRICTED_WRITE(1+2+4, 4+8+16+32+64, "restricted write"),
+  RESTRICTED_WRITE(1+4, 4+8+16+32+64, "restricted write"),
 
   /**

trunk/src/core/net/sf/basedb/core/User.java

@@ -473 +473 @@
     if (getSessionControl().getLoggedInUserId() == getId())
     {
-      granted |= Permission.grant(isMultiuserAccount() ? Permission.READ : Permission.RESTRICTED_WRITE);
+      if (isMultiuserAccount())
+      {
+        granted |= Permission.grant(Permission.READ);
+      }
+      else
+      {
+        granted |= Permission.grant(Permission.USE, Permission.RESTRICTED_WRITE);
+      }
     }
     if (getSessionControl().isFriendOf(this))