Merge remote-tracking branch 'origin/OpenOLAT_15.1' into OpenOLAT_15.2

src/main/java/org/olat/core/commons/services/pdf/dispatcher/PdfDeliveryDispatcher.java

@@ -28,6 +28,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.logging.log4j.Logger;
 import org.olat.core.commons.services.pdf.PdfModule;
 import org.olat.core.commons.services.pdf.PdfService;
 import org.olat.core.commons.services.pdf.model.PdfDelivery;
@@ -39,7 +40,6 @@ import org.olat.core.gui.components.Window;
 import org.olat.core.gui.control.creator.ControllerCreator;
 import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
 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.UserSession;
@@ -77,32 +77,38 @@ public class PdfDeliveryDispatcher implements Dispatcher {
 			response.sendError(HttpServletResponse.SC_FORBIDDEN);
 			return;
 		}
-		
-		String uriPrefix = DispatcherModule.getLegacyUriPrefix(request);
-		final String origUri = request.getRequestURI();
-		String uuid = origUri.substring(uriPrefix.length());
-		int indexSuffix = uuid.indexOf('/');
-		
-		String key = null;
-		String filename = null;
-		if(indexSuffix > 0) {
-			key = uuid.substring(0, indexSuffix);
-			filename = uuid.substring(indexSuffix + 1);
-		}
-		
-		PdfDelivery delivery = cache.get(key);
-		if(delivery == null) {
-			response.sendError(HttpServletResponse.SC_NOT_FOUND);
-		} else if(delivery.getDirectory() != null) {
-			renderFile(delivery, filename, response);
-		} else if(delivery.getControllerCreator() != null) {
-			renderController(delivery, request, response);
-		} else {
-			response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+
+		try {
+			String uriPrefix = DispatcherModule.getLegacyUriPrefix(request);
+			final String origUri = request.getRequestURI();
+			String uuid = origUri.substring(uriPrefix.length());
+			int indexSuffix = uuid.indexOf('/');
+			
+			String key = null;
+			String filename = null;
+			if(indexSuffix > 0) {
+				key = uuid.substring(0, indexSuffix);
+				filename = uuid.substring(indexSuffix + 1);
+			}
+
+			PdfDelivery delivery = cache.get(key);
+			if(delivery == null) {
+				response.sendError(HttpServletResponse.SC_NOT_FOUND);
+			} else if(origUri.contains("close-window")) {
+				response.setStatus(HttpServletResponse.SC_OK);
+			} else if(delivery.getDirectory() != null) {
+				renderFile(delivery, filename, response);
+			} else if(delivery.getControllerCreator() != null) {
+				renderController(delivery, request, response);
+			} else {
+				response.sendError(HttpServletResponse.SC_BAD_REQUEST);
+			}
+		} catch (IOException e) {
+			log.error("", e);
 		}
 	}
 	
-	private void renderController(PdfDelivery delivery, HttpServletRequest request, HttpServletResponse response) {
+	private synchronized void renderController(PdfDelivery delivery, HttpServletRequest request, HttpServletResponse response) {
 		ControllerCreator creator = delivery.getControllerCreator();
 		UserRequest ureq = new UserRequestImpl("pdfd", request, response);
 		UserSession usess = ureq.getUserSession();
@@ -113,9 +119,16 @@ public class PdfDeliveryDispatcher implements Dispatcher {
 			usess.setRoles(Roles.userRoles());
 		}
 		
-		PopupBrowserWindow pbw = delivery.getWindowControl().getWindowBackOffice()
-				.getWindowManager().createNewPopupBrowserWindowFor(ureq, creator);
-		Window window = pbw.getPopupWindowControl().getWindowBackOffice().getWindow();
+		Window window;
+		if(delivery.getWindow() == null) {
+			PopupBrowserWindow pbw = delivery.getWindowControl().getWindowBackOffice()
+					.getWindowManager().createNewPopupBrowserWindowFor(ureq, creator);
+			window = pbw.getPopupWindowControl().getWindowBackOffice().getWindow();
+			delivery.setWindow(window);
+			delivery.setBrowserWindow(pbw);
+		} else {
+			window = delivery.getWindow();
+		}
 		window.dispatchRequest(ureq, true);
 	}
 	

src/main/java/org/olat/core/commons/services/pdf/manager/AthenaPdfSPI.java

@@ -41,6 +41,7 @@ import org.olat.core.commons.services.pdf.ui.AthenaPdfSettingsController;
 import org.olat.core.configuration.AbstractSpringModule;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.control.Controller;
+import org.olat.core.gui.control.Disposable;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.creator.ControllerCreator;
 import org.olat.core.helpers.Settings;
@@ -143,6 +144,9 @@ public class AthenaPdfSPI extends AbstractSpringModule implements PdfSPI {
 		cache.put(key, delivery);
 		render(key, "index.html", out);
 		cache.remove(key);
+		if(delivery.getBrowserWindow() instanceof Disposable) {
+			((Disposable)delivery.getBrowserWindow()).dispose();
+		}
 	}
 
 	private void render(String key, String rootFilename, OutputStream out) {
@@ -184,7 +188,7 @@ public class AthenaPdfSPI extends AbstractSpringModule implements PdfSPI {
 			if(response.getStatusLine().getStatusCode() == 200) {
 				copyResponse(response, out);
 			} else {
-				log.error("Cannot renderer PDF: " + response.getStatusLine().getStatusCode());
+				log.error("Cannot renderer PDF: {}", response.getStatusLine().getStatusCode());
 				EntityUtils.consume(response.getEntity());
 			}
 		} catch(IOException e) {

src/main/java/org/olat/core/commons/services/pdf/model/PdfDelivery.java

@@ -21,8 +21,10 @@ package org.olat.core.commons.services.pdf.model;
 
 import java.io.Serializable;
 
+import org.olat.core.gui.components.Window;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.creator.ControllerCreator;
+import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
 import org.olat.core.id.Identity;
 
 /**
@@ -37,8 +39,11 @@ public class PdfDelivery implements Serializable {
 	private final String key;
 	private String directory;
 	private Identity identity;
-	private ControllerCreator controllerCreator;
+	
+	private Window window;
 	private WindowControl windowControl;
+	private PopupBrowserWindow browserWindow;
+	private ControllerCreator controllerCreator;
 	
 	public PdfDelivery(String key) {
 		this.key = key;
@@ -64,6 +69,14 @@ public class PdfDelivery implements Serializable {
 		this.identity = identity;
 	}
 
+	public Window getWindow() {
+		return window;
+	}
+
+	public void setWindow(Window window) {
+		this.window = window;
+	}
+
 	public WindowControl getWindowControl() {
 		return windowControl;
 	}
@@ -80,6 +93,14 @@ public class PdfDelivery implements Serializable {
 		this.controllerCreator = controllerCreator;
 	}
 
+	public PopupBrowserWindow getBrowserWindow() {
+		return browserWindow;
+	}
+
+	public void setBrowserWindow(PopupBrowserWindow browserWindow) {
+		this.browserWindow = browserWindow;
+	}
+
 	@Override
 	public int hashCode() {
 		return key.hashCode();

src/main/java/org/olat/ims/qti21/ui/QTI21AssessmentDetailsController.java

@@ -286,9 +286,11 @@ public class QTI21AssessmentDetailsController extends FormBasicController {
 			}
 			infos.add(forgeDetailsRow(sessionStatistics));
 		}
-		correctionCol.setAlwaysVisible(manualCorrections);
-		correctionCol.setDefaultVisible(manualCorrections);
-		tableEl.setColumnModelVisible(correctionCol, manualCorrections);
+		if(correctionCol != null) {
+			correctionCol.setAlwaysVisible(manualCorrections);
+			correctionCol.setDefaultVisible(manualCorrections);
+			tableEl.setColumnModelVisible(correctionCol, manualCorrections);
+		}
 		
 		Collections.sort(infos, new AssessmentTestSessionDetailsComparator());
 		tableModel.setObjects(infos);

src/main/java/org/olat/modules/ceditor/ui/ImageRunController.java

@@ -180,6 +180,8 @@ public class ImageRunController extends BasicController implements PageRunElemen
 
 	@Override
 	protected void doDispose() {
-		//
+		if(imageCmp != null) {
+			imageCmp.dispose();
+		}
 	}
 }

src/main/java/org/olat/modules/ceditor/ui/PageController.java

@@ -72,7 +72,7 @@ public class PageController extends BasicController {
 
 	@Override
 	protected void doDispose() {
-		//
+		fragmentsCmp.dispose();
 	}
 	
 	public boolean validateElements(UserRequest ureq, List<ValidationMessage> messages) {

src/main/java/org/olat/modules/ceditor/ui/PageRunControllerElement.java

@@ -24,6 +24,7 @@ import java.util.List;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.control.Controller;
+import org.olat.core.gui.control.Disposable;
 import org.olat.modules.ceditor.PageRunElement;
 import org.olat.modules.ceditor.ValidatingController;
 
@@ -33,13 +34,20 @@ import org.olat.modules.ceditor.ValidatingController;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
-public class PageRunControllerElement implements PageRunElement {
+public class PageRunControllerElement implements PageRunElement, Disposable {
 	
 	private Controller controller;
 	
 	public PageRunControllerElement(Controller controller) {
 		this.controller = controller;
 	}
+	
+	@Override
+	public void dispose() {
+		if(controller != null) {
+			controller.dispose();
+		}
+	}
 
 	@Override
 	public Component getComponent() {

src/main/java/org/olat/modules/ceditor/ui/component/PageFragmentsComponent.java

@@ -27,6 +27,7 @@ import org.olat.core.gui.components.AbstractComponent;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.ComponentCollection;
 import org.olat.core.gui.components.ComponentRenderer;
+import org.olat.core.gui.control.Disposable;
 import org.olat.modules.ceditor.ui.ValidationMessage;
 import org.olat.modules.ceditor.ui.model.PageFragment;
 
@@ -36,7 +37,7 @@ import org.olat.modules.ceditor.ui.model.PageFragment;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
-public class PageFragmentsComponent extends AbstractComponent implements ComponentCollection  {
+public class PageFragmentsComponent extends AbstractComponent implements ComponentCollection, Disposable  {
 	
 	private static final PageFragmentsComponentRenderer RENDERER = new PageFragmentsComponentRenderer();
 	
@@ -79,6 +80,19 @@ public class PageFragmentsComponent extends AbstractComponent implements Compone
 		return components;
 	}
 	
+	@Override
+	public void dispose() {
+		List<PageFragment> fragmentList = getFragments();
+		for(PageFragment fragment:fragmentList) {
+			if(fragment.getPageRunElement() instanceof Disposable) {
+				((Disposable)fragment.getPageRunElement()).dispose();
+			}
+			if(fragment.getPageElement() instanceof Disposable) {
+				((Disposable)fragment.getPageElement()).dispose();
+			}
+		}
+	}
+
 	public boolean validateElements(UserRequest ureq, List<ValidationMessage> messages) {
 		boolean allOk = true;
 		List<PageFragment> fragmentList = getFragments();

src/main/java/org/olat/modules/portfolio/ui/media/VideoMediaController.java

@@ -42,6 +42,8 @@ import org.olat.modules.portfolio.ui.MediaMetadataController;
  */
 public class VideoMediaController extends BasicController {
 	
+	private final ImageComponent videoCmp;
+	
 	public VideoMediaController(UserRequest ureq, WindowControl wControl, Media media, MediaRenderingHints hints) {
 		super(ureq, wControl);
 		
@@ -49,7 +51,7 @@ public class VideoMediaController extends BasicController {
 
 		File mediaDir = new File(FolderConfig.getCanonicalRoot(), media.getStoragePath());
 		File mediaFile = new File(mediaDir, media.getRootFilename());
-		ImageComponent videoCmp = new ImageComponent(ureq.getUserSession(), "image");
+		videoCmp = new ImageComponent(ureq.getUserSession(), "image");
 		videoCmp.setMedia(mediaFile);
 		mainVC.put("video", videoCmp);
 		mainVC.contextPut("pdf", hints.isToPdf());
@@ -77,6 +79,6 @@ public class VideoMediaController extends BasicController {
 
 	@Override
 	protected void doDispose() {
-		//
+		videoCmp.dispose();
 	}
 }

src/main/java/org/olat/modules/quality/manager/QualityReportAccessDAO.java

@@ -241,15 +241,15 @@ class QualityReportAccessDAO {
 	private List<Identity> loadRecipientsOfGroupRoles(QualityReportAccess reportAccess) {
 		QueryBuilder sb = new QueryBuilder();
 		sb.append("select membership.identity");
-		sb.append("  from qualityreportaccess as ra");
-		sb.append("     , qualitydatacollection as collection");
-		sb.append("     , qualitycontext as context");
-		sb.append("     , repoentrytogroup as rel");
-		sb.append("     , bgroupmember as membership");
-		sb.and().append("ra.dataCollection.key = context.dataCollection.key");
-		sb.and().append("rel.entry.key = context.audienceRepositoryEntry.key");
-		sb.and().append("rel.group.key = membership.group.key");
-		sb.and().append("membership.role = ra.role");
+		sb.append("  from qualitycontext as context");
+		sb.append("       join context.dataCollection as collection");
+		sb.append("       join qualityreportaccess as ra");
+		sb.append("         on ra.dataCollection.key = context.dataCollection.key");
+		sb.append("       join repoentrytogroup as rel");
+		sb.append("         on rel.entry.key = context.audienceRepositoryEntry.key");
+		sb.append("       join bgroupmember as membership");
+		sb.append("         on membership.group.key = rel.group.key");
+		sb.append("        and membership.role = ra.role");
 		sb.and().append("ra.key = :reportAccessKey");
 		
 		List<Identity> coureseMembers = dbInstance.getCurrentEntityManager()
@@ -259,15 +259,15 @@ class QualityReportAccessDAO {
 		
 		QueryBuilder sbEle = new QueryBuilder();
 		sbEle.append("select membership.identity");
-		sbEle.append("  from qualityreportaccess as ra");
-		sbEle.append("     , qualitydatacollection as collection");
-		sbEle.append("     , qualitycontext as context");
-		sbEle.append("     , curriculumelement as ele");
-		sbEle.append("     , bgroupmember as membership");
-		sbEle.and().append("ra.dataCollection.key = context.dataCollection.key");
-		sbEle.and().append("ele.key = context.audienceCurriculumElement.key");
-		sbEle.and().append("ele.group.key = membership.group.key");
-		sbEle.and().append("membership.role = ra.role");
+		sbEle.append("  from qualitycontext as context");
+		sbEle.append("       join context.dataCollection as collection");
+		sbEle.append("       join qualityreportaccess as ra");
+		sbEle.append("         on ra.dataCollection.key = context.dataCollection.key");
+		sbEle.append("       join curriculumelement as ele");
+		sbEle.append("         on ele.key = context.audienceCurriculumElement.key");
+		sbEle.append("       join bgroupmember as membership");
+		sbEle.append("         on membership.group.key = ele.group.key");
+		sbEle.append("        and membership.role = ra.role");
 		sbEle.and().append("ra.key = :reportAccessKey");
 		
 		List<Identity> curriculumElementMembers = dbInstance.getCurrentEntityManager()
@@ -302,8 +302,8 @@ class QualityReportAccessDAO {
 		QueryBuilder sb = new QueryBuilder();
 		sb.append("select membership.identity");
 		sb.append("  from qualityreportaccess as ra");
-		sb.append("     , bgroupmember as membership");
-		sb.and().append("ra.group.key = membership.group.key");
+		sb.append("       join bgroupmember as membership");
+		sb.append("         on membership.group.key = ra.group.key");
 		sb.and().append("ra.key = :reportAccessKey");
 		
 		return dbInstance.getCurrentEntityManager()