From 9e5657b5a7c8638de0259ad2ad094c0651774078 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 4 Sep 2019 11:40:49 +0200
Subject: [PATCH] OO-4207: Delete unnecessary velocity container
---
.../ui/TabbableLeaningPathNodeConfigController.java | 8 +-------
.../org/olat/course/learningpath/ui/_content/config.html | 1 -
2 files changed, 1 insertion(+), 8 deletions(-)
delete mode 100644 src/main/java/org/olat/course/learningpath/ui/_content/config.html
diff --git a/src/main/java/org/olat/course/learningpath/ui/TabbableLeaningPathNodeConfigController.java b/src/main/java/org/olat/course/learningpath/ui/TabbableLeaningPathNodeConfigController.java
index 60a351dc987..f8b3d2a1eb8 100644
--- a/src/main/java/org/olat/course/learningpath/ui/TabbableLeaningPathNodeConfigController.java
+++ b/src/main/java/org/olat/course/learningpath/ui/TabbableLeaningPathNodeConfigController.java
@@ -22,7 +22,6 @@ package org.olat.course.learningpath.ui;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.tabbedpane.TabbedPane;
-import org.olat.core.gui.components.velocity.VelocityContainer;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
@@ -40,24 +39,19 @@ public class TabbableLeaningPathNodeConfigController extends ActivateableTabbabl
private static final String PANE_TAB_LEARNIN_PATH = "pane.tab.learning.path";
private final static String[] paneKeys = { PANE_TAB_LEARNIN_PATH };
- private final VelocityContainer configVC;
private final Controller configCtrl;
private TabbedPane tabPane;
public TabbableLeaningPathNodeConfigController(UserRequest ureq, WindowControl wControl, Controller configCtrl) {
super(ureq, wControl);
this.configCtrl = configCtrl;
-
listenTo(configCtrl);
-
- configVC = createVelocityContainer("config");
- configVC.put("config", configCtrl.getInitialComponent());
}
@Override
public void addTabs(TabbedPane tabbedPane) {
tabPane = tabbedPane;
- tabbedPane.addTab(translate(PANE_TAB_LEARNIN_PATH), configVC);
+ tabbedPane.addTab(translate(PANE_TAB_LEARNIN_PATH), configCtrl.getInitialComponent());
}
@Override
diff --git a/src/main/java/org/olat/course/learningpath/ui/_content/config.html b/src/main/java/org/olat/course/learningpath/ui/_content/config.html
deleted file mode 100644
index a6a4023478b..00000000000
--- a/src/main/java/org/olat/course/learningpath/ui/_content/config.html
+++ /dev/null
@@ -1 +0,0 @@
-$r.render("config")
\ No newline at end of file
--
GitLab