From febe6b62b78b2d7f540d0047f5664dda031311a5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 2 Sep 2016 15:46:31 +0200
Subject: [PATCH] OO-2057: fix NPE if a v1 task is opened from a course and
portfolio v1 disabled
---
.../org/olat/portfolio/ui/EPMapRunController.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/src/main/java/org/olat/portfolio/ui/EPMapRunController.java b/src/main/java/org/olat/portfolio/ui/EPMapRunController.java
index 05e9a4d02bc..d749d43e232 100755
--- a/src/main/java/org/olat/portfolio/ui/EPMapRunController.java
+++ b/src/main/java/org/olat/portfolio/ui/EPMapRunController.java
@@ -26,7 +26,6 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
@@ -39,7 +38,6 @@ import org.olat.core.id.Identity;
import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry;
import org.olat.portfolio.EPTemplateMapResource;
-import org.olat.portfolio.PortfolioModule;
import org.olat.portfolio.manager.EPFrontendManager;
import org.olat.portfolio.model.structel.EPDefaultMap;
import org.olat.portfolio.model.structel.EPStructuredMap;
@@ -81,8 +79,6 @@ public class EPMapRunController extends BasicController implements Activateable2
private final EPMapRunViewOption option;
@Autowired
private EPFrontendManager ePFMgr;
- @Autowired
- private PortfolioModule portfolioModule;
private Link createMapCalloutLink;
private CloseableCalloutWindowController mapCreateCalloutCtrl;
@@ -102,13 +98,7 @@ public class EPMapRunController extends BasicController implements Activateable2
this.option = option;
this.choosenOwner = choosenOwner;
- Component viewComp;
- if (portfolioModule.isEnabled()){
- viewComp = init(ureq);
- } else {
- viewComp = new Panel("empty");
- }
-
+ Component viewComp = init(ureq);
putInitialPanel(viewComp);
}
--
GitLab