no-jira: post merge changes

src/main/java/org/olat/core/gui/control/winmgr/WindowManagerImpl.java

@@ -39,8 +39,6 @@ import org.olat.core.gui.WindowManager;
 import org.olat.core.gui.WindowSettings;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.ComponentRenderer;
-import org.olat.core.gui.components.velocity.VelocityContainer;
-import org.olat.core.gui.components.velocity.VelocityContainerRenderer;
 import org.olat.core.gui.control.ChiefController;
 import org.olat.core.gui.control.ContentableChiefController;
 import org.olat.core.gui.control.WindowBackOffice;

src/main/java/org/olat/restapi/repository/course/CoursesWebService.java

@@ -50,7 +50,6 @@ import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.Controller;
-import org.olat.core.helpers.Settings;
 import org.olat.core.id.Identity;
 import org.olat.core.id.OLATResourceable;
 import org.olat.core.id.Roles;
@@ -147,7 +146,6 @@ public class CoursesWebService {
 			@Context HttpServletRequest httpRequest, @Context Request request) {
 		RepositoryManager rm = RepositoryManager.getInstance();
 
-		//fxdiff VCRP-1,2: access control of resources
 		Roles roles = getRoles(httpRequest);
 		Identity identity = getIdentity(httpRequest);
 		SearchRepositoryEntryParameters params = new SearchRepositoryEntryParameters(identity, roles, CourseModule.getCourseTypeName());
@@ -180,7 +178,7 @@ public class CoursesWebService {
 		int count=0;
 		for (RepositoryEntry repoEntry : repoEntries) {
 			try {
-				ICourse course = CourseWebService.loadCourse(repoEntry.getOlatResource().getResourceableId());
+				ICourse course = loadCourse(repoEntry.getOlatResource().getResourceableId());
 				voList.add(ObjectFactory.get(repoEntry, course));
 				if(count % 33 == 0) {
 					DBFactory.getInstance().commitAndCloseSession();
@@ -197,13 +195,10 @@ public class CoursesWebService {
 	
 	@Path("{courseId}")
 	public CourseWebService getCourse(@PathParam("courseId") Long courseId) {
-		OLATResource ores = getCourseOLATResource(courseId);
-		if(ores == null) return null;
-		ICourse course = CourseFactory.loadCourse(courseId);
+		ICourse course = loadCourse(courseId);
 		if(course == null) return null;
-		CourseWebService courseWs = new CourseWebService(ores, course);
-		
-		return courseWs;
+		OLATResource ores = course.getCourseEnvironment().getCourseGroupManager().getCourseResource();
+		return new CourseWebService(ores, course);
 	}
 
 	/**
@@ -328,16 +323,6 @@ public class CoursesWebService {
 		return Response.ok(vo).build();
 	}
 	
-	private OLATResource getCourseOLATResource(Long courseId) {
-		String typeName = OresHelper.calculateTypeName(CourseModule.class);
-		OLATResource ores = OLATResourceManager.getInstance().findResourceable(courseId, typeName);
-		if(ores == null && Settings.isJUnitTest()) {
-			//hack for the BGContextManagerImpl which load the course
-			ores = OLATResourceManager.getInstance().findResourceable(courseId, "junitcourse");
-		}
-		return ores;
-	}
-	
 	public static boolean isCourseAccessible(ICourse course, boolean authorRightsMandatory, HttpServletRequest request) {
 		if(authorRightsMandatory && !isAuthor(request)) {
 			return false;
@@ -363,7 +348,6 @@ public class CoursesWebService {
 		}
 	}
 	
-	
 	public static ICourse importCourse(UserRequest ureq, Identity identity, File fCourseImportZIP,
 			String displayName, String softKey, int access, boolean membersOnly) {