Changeset 15:58357a4b86de in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/Annotation.java

Timestamp:

Aug 28, 2012, 6:23:12 PM (12 years ago)

Author:

casties

Branch:

default

Message:

ASSIGNED - # 249: Annotations shared in groups
​https://it-dev.mpiwg-berlin.mpg.de/tracs/mpdl-project-software/ticket/249

File:

• src/main/java/de/mpiwg/itgroup/annotations/Annotation.java (modified) (3 diffs)

src/main/java/de/mpiwg/itgroup/annotations/Annotation.java

@@ -3 +3 @@
  */
 package de.mpiwg.itgroup.annotations;
+
+import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 
 /**
@@ -86 +88 @@
      * 
      * @param action
-     * @param userId
+     * @param user
+     * @param store AnnotationStore to check group membership
      * @return
      */
-    public boolean isActionAllowed(String action, String userId) {
+    public boolean isActionAllowed(String action, Person user, AnnotationStore store) {
         if (action.equals("read")) {
             Actor reader = getReadPermission();
@@ -95 +98 @@
                 return true;
             } else {
-                return reader.isEquivalentWith(userId);
+                return reader.isEquivalentWith(user, store);
             }
         } else if (action.equals("update")) {
             // require at least an authenticated user
-            if (userId == null) return false;
+            if (user == null) return false;
             Actor updater = getUpdatePermission();
             if (updater == null) {
                 return true;
             } else {
-                return updater.isEquivalentWith(userId);
+                return updater.isEquivalentWith(user, store);
             }
         } else if (action.equals("delete")) {
             // require at least an authenticated user
-            if (userId == null) return false;
+            if (user == null) return false;
             Actor updater = getUpdatePermission();
             if (updater == null) {
                 return true;
             } else {
-                return updater.isEquivalentWith(userId);
+                return updater.isEquivalentWith(user, store);
             }
         } else if (action.equals("admin")) {
             // require at least an authenticated user
-            if (userId == null) return false;
+            if (user == null) return false;
             Actor admin = getAdminPermission();
             if (admin == null) {
                 return true;
             } else {
-                return admin.isEquivalentWith(userId);
+                return admin.isEquivalentWith(user, store);
             }
         }