From 547b17094c7ec7daf7ba7fd5014df7edea78b61f Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Wed, 16 Apr 2014 15:12:34 +0200 Subject: [PATCH] OO-1016: mark the notifications for the assessed person which will receive the notifications --- .../nodes/ta/DropboxScoringViewController.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java index b36cbab1e88..fee7a1c831a 100644 --- a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java +++ b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java @@ -163,11 +163,13 @@ public class DropboxScoringViewController extends BasicController { myContent.put("dropbox", dropboxFolderRunController.getInitialComponent()); + Identity assessedIdentity = userCourseEnv.getIdentityEnvironment().getIdentity(); // returnbox display OlatRootFolderImpl rootReturnbox = new OlatRootFolderImpl(getReturnboxFilePath(assesseeName), null); - rootReturnbox.setLocalSecurityCallback( getReturnboxVfsSecurityCallback(rootReturnbox.getRelPath()) ); + VFSSecurityCallback secCallback = getReturnboxVfsSecurityCallback(rootReturnbox.getRelPath(), assessedIdentity); + rootReturnbox.setLocalSecurityCallback(secCallback); OlatNamedContainerImpl namedReturnbox = new OlatNamedContainerImpl(assesseeFullName, rootReturnbox); - namedReturnbox.setLocalSecurityCallback(getReturnboxVfsSecurityCallback(rootReturnbox.getRelPath())); + namedReturnbox.setLocalSecurityCallback(secCallback); returnboxFolderRunController = new FolderRunController(namedReturnbox, false, ureq, getWindowControl()); returnboxFolderRunController.disableSubscriptionController(); @@ -188,7 +190,7 @@ public class DropboxScoringViewController extends BasicController { myContent.put("statusForm",statusForm.getInitialComponent()); } - assignedTask = TaskController.getAssignedTask(userCourseEnv.getIdentityEnvironment().getIdentity(), userCourseEnv.getCourseEnvironment(), node); + assignedTask = TaskController.getAssignedTask(assessedIdentity, userCourseEnv.getCourseEnvironment(), node); if (assignedTask != null) { myContent.contextPut("assignedtask", assignedTask); if (!(assignedTask.toLowerCase().endsWith(".html") || assignedTask.toLowerCase().endsWith(".htm") || assignedTask.toLowerCase().endsWith(".txt"))){ @@ -201,9 +203,9 @@ public class DropboxScoringViewController extends BasicController { return new ReadOnlyAndDeleteCallback(); } - protected VFSSecurityCallback getReturnboxVfsSecurityCallback(String returnboxRelPath) { + protected VFSSecurityCallback getReturnboxVfsSecurityCallback(String returnboxRelPath, Identity assessedIdentity) { SubscriptionContext subscriptionContext = ReturnboxFileUploadNotificationHandler - .getSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, getIdentity()); + .getSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, assessedIdentity); return new ReturnboxFullAccessCallback(returnboxRelPath, subscriptionContext); } -- GitLab