diff --git a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java index 8a75c6efbd7..047d115b8df 100644 --- a/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java +++ b/inception/inception-documents/src/main/java/de/tudarmstadt/ukp/inception/documents/DocumentAccessImpl.java @@ -19,7 +19,6 @@ import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.CURATOR; import static de.tudarmstadt.ukp.clarin.webanno.model.PermissionLevel.MANAGER; -import static de.tudarmstadt.ukp.clarin.webanno.support.WebAnnoConst.CURATION_USER; import static org.apache.commons.collections4.CollectionUtils.containsAny; import java.util.List; @@ -91,15 +90,17 @@ public boolean canViewAnnotationDocument(String aUser, String aProjectId, long a return false; } - // Annotators can see their own annotations and manager/curators can see annotations of - // all users - if (!aUser.equals(aAnnotator) && !permissionLevels.contains(MANAGER) - && !(CURATION_USER.equals(aUser) - && containsAny(permissionLevels, MANAGER, CURATOR))) { + // Managers and curators can see anything + if (containsAny(permissionLevels, MANAGER, CURATOR)) { + return true; + } + + // Annotators can only see their own documents + if (!aUser.equals(aAnnotator)) { return false; } - // Blocked documents cannot be viewed + // Annotators cannot view blocked documents SourceDocument doc = documentService.getSourceDocument(project.getId(), aDocumentId); if (documentService.existsAnnotationDocument(doc, aAnnotator)) { AnnotationDocument aDoc = documentService.getAnnotationDocument(doc, aAnnotator); diff --git a/inception/pom.xml b/inception/pom.xml index c19ee8369c6..20f4efaf184 100644 --- a/inception/pom.xml +++ b/inception/pom.xml @@ -72,7 +72,7 @@ 2.3.0 3.4.1 3.4.0 - 0.4.0 + 0.5.0 2.0.27