From d8392887d9f9d4715eab82b54382ac570ec5781f Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 15 Aug 2019 15:47:12 +0200
Subject: [PATCH] OO-4150: set default "view as" in course
---
.../olat/commons/calendar/restapi/CalWebService.java | 7 -------
.../modules/fo/restapi/ForumImportWebService.java | 1 -
.../org/olat/modules/fo/restapi/ForumWebService.java | 7 +------
.../lecture/ui/LecturesSecurityCallbackFactory.java | 12 +++++++++++-
4 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/olat/commons/calendar/restapi/CalWebService.java b/src/main/java/org/olat/commons/calendar/restapi/CalWebService.java
index de557eefbd2..a03dc00e16c 100644
--- a/src/main/java/org/olat/commons/calendar/restapi/CalWebService.java
+++ b/src/main/java/org/olat/commons/calendar/restapi/CalWebService.java
@@ -31,9 +31,7 @@ import java.util.Collections;
import java.util.List;
import java.util.UUID;
-import javax.management.DescriptorKey;
import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.ApplicationPath;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
@@ -56,19 +54,14 @@ import org.olat.commons.calendar.ui.components.KalendarRenderWrapper;
import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.util.StringHelper;
-import org.olat.restapi.support.vo.RepositoryEntryVO;
-import org.springframework.context.annotation.Description;
-import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.info.License;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.info.Info;
/**
*
diff --git a/src/main/java/org/olat/modules/fo/restapi/ForumImportWebService.java b/src/main/java/org/olat/modules/fo/restapi/ForumImportWebService.java
index 5cee8bd66aa..254cb4b75c1 100644
--- a/src/main/java/org/olat/modules/fo/restapi/ForumImportWebService.java
+++ b/src/main/java/org/olat/modules/fo/restapi/ForumImportWebService.java
@@ -33,7 +33,6 @@ import org.olat.modules.fo.manager.ForumManager;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
/**
diff --git a/src/main/java/org/olat/modules/fo/restapi/ForumWebService.java b/src/main/java/org/olat/modules/fo/restapi/ForumWebService.java
index 529992c9448..2b7a8dd611c 100644
--- a/src/main/java/org/olat/modules/fo/restapi/ForumWebService.java
+++ b/src/main/java/org/olat/modules/fo/restapi/ForumWebService.java
@@ -57,15 +57,14 @@ import javax.ws.rs.core.UriInfo;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.Logger;
import org.olat.basesecurity.BaseSecurity;
import org.olat.basesecurity.OrganisationRoles;
import org.olat.basesecurity.model.IdentityRefImpl;
-import org.olat.commons.calendar.restapi.CalendarVO;
import org.olat.core.commons.services.vfs.restapi.VFSStreamingOutput;
import org.olat.core.gui.media.ServletUtil;
import org.olat.core.id.Identity;
import org.olat.core.id.Roles;
-import org.apache.logging.log4j.Logger;
import org.olat.core.logging.Tracing;
import org.olat.core.util.FileUtils;
import org.olat.core.util.StringHelper;
@@ -87,10 +86,6 @@ import org.olat.restapi.support.vo.FileVO;
import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.responses.ApiResponse;
-import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag;
/**
diff --git a/src/main/java/org/olat/modules/lecture/ui/LecturesSecurityCallbackFactory.java b/src/main/java/org/olat/modules/lecture/ui/LecturesSecurityCallbackFactory.java
index e821e64e5d3..a1c6a810daa 100644
--- a/src/main/java/org/olat/modules/lecture/ui/LecturesSecurityCallbackFactory.java
+++ b/src/main/java/org/olat/modules/lecture/ui/LecturesSecurityCallbackFactory.java
@@ -31,7 +31,17 @@ import org.olat.modules.lecture.LectureModule;
public class LecturesSecurityCallbackFactory {
public static LecturesSecurityCallback getSecurityCallback(boolean adminRole, boolean masterCoachRole, boolean teacherRole) {
- return new LecturesSecurityCallbackImpl(adminRole, masterCoachRole, teacherRole, null);
+ LectureRoles viewAs;
+ if(adminRole) {
+ viewAs = LectureRoles.lecturemanager;
+ } else if(masterCoachRole) {
+ viewAs = LectureRoles.mastercoach;
+ } else if(teacherRole) {
+ viewAs = LectureRoles.teacher;
+ } else {
+ viewAs = LectureRoles.participant;
+ }
+ return new LecturesSecurityCallbackImpl(adminRole, masterCoachRole, teacherRole, viewAs);
}
public static LecturesSecurityCallback getSecurityCallback(boolean adminRole, boolean masterCoachRole, boolean teacherRole, LectureRoles viewAs) {
--
GitLab