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

OO-4150: set default "view as" in course

parent 22dd3d3c
No related branches found
No related tags found
No related merge requests found
...@@ -31,9 +31,7 @@ import java.util.Collections; ...@@ -31,9 +31,7 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import javax.management.DescriptorKey;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.ApplicationPath;
import javax.ws.rs.Consumes; import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE; import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue; import javax.ws.rs.DefaultValue;
...@@ -56,19 +54,14 @@ import org.olat.commons.calendar.ui.components.KalendarRenderWrapper; ...@@ -56,19 +54,14 @@ import org.olat.commons.calendar.ui.components.KalendarRenderWrapper;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
import org.olat.core.util.StringHelper; 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.Operation;
import io.swagger.v3.oas.annotations.Parameter; 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.Content;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.info.Info;
/** /**
* *
......
...@@ -33,7 +33,6 @@ import org.olat.modules.fo.manager.ForumManager; ...@@ -33,7 +33,6 @@ import org.olat.modules.fo.manager.ForumManager;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
/** /**
......
...@@ -57,15 +57,14 @@ import javax.ws.rs.core.UriInfo; ...@@ -57,15 +57,14 @@ import javax.ws.rs.core.UriInfo;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.Logger;
import org.olat.basesecurity.BaseSecurity; import org.olat.basesecurity.BaseSecurity;
import org.olat.basesecurity.OrganisationRoles; import org.olat.basesecurity.OrganisationRoles;
import org.olat.basesecurity.model.IdentityRefImpl; 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.commons.services.vfs.restapi.VFSStreamingOutput;
import org.olat.core.gui.media.ServletUtil; import org.olat.core.gui.media.ServletUtil;
import org.olat.core.id.Identity; import org.olat.core.id.Identity;
import org.olat.core.id.Roles; import org.olat.core.id.Roles;
import org.apache.logging.log4j.Logger;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.core.util.FileUtils; import org.olat.core.util.FileUtils;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
...@@ -87,10 +86,6 @@ import org.olat.restapi.support.vo.FileVO; ...@@ -87,10 +86,6 @@ import org.olat.restapi.support.vo.FileVO;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import io.swagger.v3.oas.annotations.Operation; 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; import io.swagger.v3.oas.annotations.tags.Tag;
/** /**
......
...@@ -31,7 +31,17 @@ import org.olat.modules.lecture.LectureModule; ...@@ -31,7 +31,17 @@ import org.olat.modules.lecture.LectureModule;
public class LecturesSecurityCallbackFactory { public class LecturesSecurityCallbackFactory {
public static LecturesSecurityCallback getSecurityCallback(boolean adminRole, boolean masterCoachRole, boolean teacherRole) { 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) { public static LecturesSecurityCallback getSecurityCallback(boolean adminRole, boolean masterCoachRole, boolean teacherRole, LectureRoles viewAs) {
......
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