Skip to content
Snippets Groups Projects
Commit febe6b62 authored by srosse's avatar srosse
Browse files

OO-2057: fix NPE if a v1 task is opened from a course and portfolio v1 disabled

parent 64da5947
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,6 @@ import org.olat.core.gui.UserRequest; ...@@ -26,7 +26,6 @@ import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component; import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.link.Link; import org.olat.core.gui.components.link.Link;
import org.olat.core.gui.components.link.LinkFactory; 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.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller; import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event; import org.olat.core.gui.control.Event;
...@@ -39,7 +38,6 @@ import org.olat.core.id.Identity; ...@@ -39,7 +38,6 @@ import org.olat.core.id.Identity;
import org.olat.core.id.context.ContextEntry; import org.olat.core.id.context.ContextEntry;
import org.olat.core.id.context.StateEntry; import org.olat.core.id.context.StateEntry;
import org.olat.portfolio.EPTemplateMapResource; import org.olat.portfolio.EPTemplateMapResource;
import org.olat.portfolio.PortfolioModule;
import org.olat.portfolio.manager.EPFrontendManager; import org.olat.portfolio.manager.EPFrontendManager;
import org.olat.portfolio.model.structel.EPDefaultMap; import org.olat.portfolio.model.structel.EPDefaultMap;
import org.olat.portfolio.model.structel.EPStructuredMap; import org.olat.portfolio.model.structel.EPStructuredMap;
...@@ -81,8 +79,6 @@ public class EPMapRunController extends BasicController implements Activateable2 ...@@ -81,8 +79,6 @@ public class EPMapRunController extends BasicController implements Activateable2
private final EPMapRunViewOption option; private final EPMapRunViewOption option;
@Autowired @Autowired
private EPFrontendManager ePFMgr; private EPFrontendManager ePFMgr;
@Autowired
private PortfolioModule portfolioModule;
private Link createMapCalloutLink; private Link createMapCalloutLink;
private CloseableCalloutWindowController mapCreateCalloutCtrl; private CloseableCalloutWindowController mapCreateCalloutCtrl;
...@@ -102,13 +98,7 @@ public class EPMapRunController extends BasicController implements Activateable2 ...@@ -102,13 +98,7 @@ public class EPMapRunController extends BasicController implements Activateable2
this.option = option; this.option = option;
this.choosenOwner = choosenOwner; this.choosenOwner = choosenOwner;
Component viewComp; Component viewComp = init(ureq);
if (portfolioModule.isEnabled()){
viewComp = init(ureq);
} else {
viewComp = new Panel("empty");
}
putInitialPanel(viewComp); putInitialPanel(viewComp);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment