From 6a3bdef69373ffccfe1e15fa1f57c01941f9fb93 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Thu, 9 Apr 2020 15:28:37 +0200
Subject: [PATCH] OO-4521: RS when open a former portfolio V1 course node
---
src/main/java/org/olat/course/nodes/PortfolioCourseNode.java | 2 +-
.../modules/portfolio/ui/CourseTemplateSearchController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
index da7c423c711..5d570809d1d 100644
--- a/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/PortfolioCourseNode.java
@@ -148,7 +148,7 @@ public class PortfolioCourseNode extends AbstractAccessableCourseNode {
controller = MessageUIFactory.createInfoMessage(ureq, wControl, title, message);
} else {
RepositoryEntry mapEntry = getReferencedRepositoryEntry();
- if(BinderTemplateResource.TYPE_NAME.equals(mapEntry.getOlatResource().getResourceableTypeName())) {
+ if(mapEntry != null && BinderTemplateResource.TYPE_NAME.equals(mapEntry.getOlatResource().getResourceableTypeName())) {
controller = new PortfolioCourseNodeRunController(ureq, wControl, userCourseEnv, this);
} else {
Translator trans = Util.createPackageTranslator(PortfolioCourseNodeRunController.class, ureq.getLocale());
diff --git a/src/main/java/org/olat/modules/portfolio/ui/CourseTemplateSearchController.java b/src/main/java/org/olat/modules/portfolio/ui/CourseTemplateSearchController.java
index 78cee001b5a..938ba5daec8 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/CourseTemplateSearchController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/CourseTemplateSearchController.java
@@ -137,7 +137,7 @@ public class CourseTemplateSearchController extends FormBasicController {
.getNodeById(pNode.getIdent());
if (treeNode != null && treeNode.isAccessible()) {
RepositoryEntry refEntry = pNode.getReferencedRepositoryEntry();
- if("BinderTemplate".equals(refEntry.getOlatResource().getResourceableTypeName())) {
+ if(refEntry != null && "BinderTemplate".equals(refEntry.getOlatResource().getResourceableTypeName())) {
RepositoryEntry courseEntry = uce.getCourseEnvironment().getCourseGroupManager().getCourseEntry();
CurrentBinder binderKey = new CurrentBinder(courseEntry.getKey(), pNode.getIdent());
--
GitLab