FXOLAT-193 OLAT-6302 add missing business path context entry pop

--HG--
branch : uzhFixes711

olat3/webapp/WEB-INF/src/org/olat/commons/info/ui/InfoDisplayController.java

@@ -53,6 +53,7 @@ import org.olat.core.id.Identity;
 import org.olat.core.id.OLATResourceable;
 import org.olat.core.id.User;
 import org.olat.core.id.UserConstants;
+import org.olat.core.id.context.ContextEntry;
 import org.olat.core.util.Formatter;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.coordinate.CoordinatorManager;
@@ -123,6 +124,24 @@ public class InfoDisplayController extends FormBasicController {
 		}
 		
 		initForm(ureq);
+		
+		// OLAT-6302 when a specific message is shown display the page that
+		// contains the message. Jump in e.g. from portlet
+		ContextEntry ce = wControl.getBusinessControl().popLauncherContextEntry();
+		if (ce != null) { // a context path is left for me
+			OLATResourceable businessPathResource = ce.getOLATResourceable();
+			String typeName = businessPathResource.getResourceableTypeName();
+			if ("InfoMessage".equals(typeName)) {
+				Long messageId = businessPathResource.getResourceableId();
+				if (messageId != null && messageId.longValue() > 0) {
+					// currently no pageing is implemented, just page with all entries
+					maxResults = -1;
+					after = null;
+				}
+			}
+		}
+		
+		// now load with configuration
 		loadMessages();
 	}
 	

olatcore/src/main/java/org/olat/core/commons/modules/bc/FolderRunController.java

@@ -419,7 +419,7 @@ public class FolderRunController extends BasicController implements Activateable
 				}
 			}
 			VFSItem vfsItem = folderComponent.getRootContainer().resolve(path.endsWith("/") ? path.substring(0, path.length()-1) : path);
-			if (!(vfsItem instanceof VFSContainer)) {
+			if (vfsItem != null && !(vfsItem instanceof VFSContainer)) {
 				// could be a file - create the mapper - otherwise don't create one if it's a directory
 				
 				// Create a mapper to deliver the auto-download of the file. We have to