Changeset 41:5d4260344db5 in AnnotationManagerN4J

Timestamp:

Sep 26, 2012, 12:59:00 PM (12 years ago)

Author:

casties

Branch:

default

Parents:

40:03e0f7574224 (diff), 39:1cf5fca36633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with 21c5394ea0cbb6738016a3c7d03b5ce7943d6216

Location:

src/main

Files:

• java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java (modified) (1 diff)
• java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java (modified) (3 diffs)
• webapp/tags/css/tag.css (deleted)
• webapp/tags/js/jquery-1.8.2.min.js (deleted)
• webapp/tags/js/tag.js (deleted)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

@@ -24 +24 @@
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Person;
-import de.mpiwg.itgroup.annotations.Tag;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 import de.mpiwg.itgroup.annotations.restlet.utils.JSONObjectComparator;

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java

@@ -55 +55 @@
         logger.debug("annotation-id=" + id);
 
+        
+        // do authentication
+        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
+        logger.debug("request authenticated=" + authUser);
+
         if (id == null) {
             
-            return getAllAnnotations();
-        }
-
-        // do authentication
-        Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
-        logger.debug("request authenticated=" + authUser);
-
+            return getAllAnnotations(authUser);
+        }
+
+     
         AnnotationStore store = getAnnotationStore();
         Annotation annot = store.getAnnotationById(id);
@@ -82 +84 @@
     }
 
-    private Representation getAllAnnotations() {
+    private Representation getAllAnnotations(Person authUser) {
         
          Form form = getRequest().getResourceRef().getQueryAsForm();
@@ -97 +99 @@
         List<Annotation> annotations = store.getAnnotations(null, null);
         for (Annotation annotation : annotations) {
-                
+                 //check permission
+                         if (!annotation.isActionAllowed("read", authUser, store)) continue;
+     
                  JSONObject jo = createAnnotatorJson(annotation,false);
              results.add(jo);