Skip to content
Snippets Groups Projects
Commit 45efa592 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 9.3 to OpenOLAT default branch with 252fc2231881d65d9a33fab86acc15b802e65af0

parents 4888b05e 547b1709
No related branches found
No related tags found
No related merge requests found
...@@ -163,11 +163,13 @@ public class DropboxScoringViewController extends BasicController { ...@@ -163,11 +163,13 @@ public class DropboxScoringViewController extends BasicController {
myContent.put("dropbox", dropboxFolderRunController.getInitialComponent()); myContent.put("dropbox", dropboxFolderRunController.getInitialComponent());
Identity assessedIdentity = userCourseEnv.getIdentityEnvironment().getIdentity();
// returnbox display // returnbox display
OlatRootFolderImpl rootReturnbox = new OlatRootFolderImpl(getReturnboxFilePath(assesseeName), null); 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); OlatNamedContainerImpl namedReturnbox = new OlatNamedContainerImpl(assesseeFullName, rootReturnbox);
namedReturnbox.setLocalSecurityCallback(getReturnboxVfsSecurityCallback(rootReturnbox.getRelPath())); namedReturnbox.setLocalSecurityCallback(secCallback);
returnboxFolderRunController = new FolderRunController(namedReturnbox, false, ureq, getWindowControl()); returnboxFolderRunController = new FolderRunController(namedReturnbox, false, ureq, getWindowControl());
returnboxFolderRunController.disableSubscriptionController(); returnboxFolderRunController.disableSubscriptionController();
...@@ -188,7 +190,7 @@ public class DropboxScoringViewController extends BasicController { ...@@ -188,7 +190,7 @@ public class DropboxScoringViewController extends BasicController {
myContent.put("statusForm",statusForm.getInitialComponent()); myContent.put("statusForm",statusForm.getInitialComponent());
} }
assignedTask = TaskController.getAssignedTask(userCourseEnv.getIdentityEnvironment().getIdentity(), userCourseEnv.getCourseEnvironment(), node); assignedTask = TaskController.getAssignedTask(assessedIdentity, userCourseEnv.getCourseEnvironment(), node);
if (assignedTask != null) { if (assignedTask != null) {
myContent.contextPut("assignedtask", assignedTask); myContent.contextPut("assignedtask", assignedTask);
if (!(assignedTask.toLowerCase().endsWith(".html") || assignedTask.toLowerCase().endsWith(".htm") || assignedTask.toLowerCase().endsWith(".txt"))){ if (!(assignedTask.toLowerCase().endsWith(".html") || assignedTask.toLowerCase().endsWith(".htm") || assignedTask.toLowerCase().endsWith(".txt"))){
...@@ -201,9 +203,9 @@ public class DropboxScoringViewController extends BasicController { ...@@ -201,9 +203,9 @@ public class DropboxScoringViewController extends BasicController {
return new ReadOnlyAndDeleteCallback(); return new ReadOnlyAndDeleteCallback();
} }
protected VFSSecurityCallback getReturnboxVfsSecurityCallback(String returnboxRelPath) { protected VFSSecurityCallback getReturnboxVfsSecurityCallback(String returnboxRelPath, Identity assessedIdentity) {
SubscriptionContext subscriptionContext = ReturnboxFileUploadNotificationHandler SubscriptionContext subscriptionContext = ReturnboxFileUploadNotificationHandler
.getSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, getIdentity()); .getSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, assessedIdentity);
return new ReturnboxFullAccessCallback(returnboxRelPath, subscriptionContext); return new ReturnboxFullAccessCallback(returnboxRelPath, subscriptionContext);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment