From 3a469d65a0f6519e8786d2b683a646869bc200ce Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 9 Sep 2019 16:16:45 +0200
Subject: [PATCH] OO-4207: Refactoring vitero course node to new edit
controller structure
---
.../olat/course/nodes/ViteroCourseNode.java | 6 ++++
.../nodes/vitero/ViteroEditController.java | 28 ++-----------------
.../vitero/_i18n/LocalStrings_de.properties | 4 +--
.../vitero/_i18n/LocalStrings_en.properties | 4 +--
.../vitero/_i18n/LocalStrings_fr.properties | 2 --
.../vitero/_i18n/LocalStrings_it.properties | 2 --
.../vitero/_i18n/LocalStrings_pl.properties | 1 -
.../_i18n/LocalStrings_pt_BR.properties | 2 --
8 files changed, 11 insertions(+), 38 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/ViteroCourseNode.java b/src/main/java/org/olat/course/nodes/ViteroCourseNode.java
index 92ecbc0f6f1..165ebbb5008 100644
--- a/src/main/java/org/olat/course/nodes/ViteroCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ViteroCourseNode.java
@@ -36,6 +36,7 @@ import org.olat.core.util.resource.OresHelper;
import org.olat.course.CourseModule;
import org.olat.course.ICourse;
import org.olat.course.condition.ConditionEditController;
+import org.olat.course.editor.ConditionAccessEditConfig;
import org.olat.course.editor.CourseEditorEnv;
import org.olat.course.editor.NodeEditController;
import org.olat.course.editor.StatusDescription;
@@ -89,6 +90,11 @@ public class ViteroCourseNode extends AbstractAccessableCourseNode {
return nodeEditCtr;
}
+ @Override
+ public ConditionAccessEditConfig getAccessEditConfig() {
+ return ConditionAccessEditConfig.regular(false);
+ }
+
@Override
public NodeRunConstructionResult createNodeRunConstructionResult(UserRequest ureq, WindowControl wControl,
UserCourseEnvironment userCourseEnv, CourseNodeSecurityCallback nodeSecCallback, String nodecmd) {
diff --git a/src/main/java/org/olat/course/nodes/vitero/ViteroEditController.java b/src/main/java/org/olat/course/nodes/vitero/ViteroEditController.java
index 9e7fc2af203..7392b3561d0 100644
--- a/src/main/java/org/olat/course/nodes/vitero/ViteroEditController.java
+++ b/src/main/java/org/olat/course/nodes/vitero/ViteroEditController.java
@@ -31,10 +31,6 @@ import org.olat.core.gui.control.generic.tabbable.ActivateableTabbableDefaultCon
import org.olat.core.id.OLATResourceable;
import org.olat.core.util.resource.OresHelper;
import org.olat.course.ICourse;
-import org.olat.course.assessment.AssessmentHelper;
-import org.olat.course.condition.Condition;
-import org.olat.course.condition.ConditionEditController;
-import org.olat.course.editor.NodeEditController;
import org.olat.course.nodes.ViteroCourseNode;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.vitero.ui.ViteroBookingsEditController;
@@ -50,27 +46,16 @@ import org.olat.modules.vitero.ui.ViteroBookingsEditController;
*/
public class ViteroEditController extends ActivateableTabbableDefaultController implements ControllerEventListener {
- private static final String PANE_TAB_ACCESSIBILITY = "pane.tab.accessibility";
public static final String PANE_TAB_VCCONFIG = "pane.tab.vcconfig";
- final static String[] paneKeys = { PANE_TAB_VCCONFIG, PANE_TAB_ACCESSIBILITY };
+ final static String[] paneKeys = { PANE_TAB_VCCONFIG };
private VelocityContainer editVc;
- private ConditionEditController accessibilityCondContr;
private TabbedPane tabPane;
private ViteroBookingsEditController editForm;
- private final ViteroCourseNode courseNode;
-
public ViteroEditController(UserRequest ureq, WindowControl wControl, ViteroCourseNode courseNode,
ICourse course, UserCourseEnvironment userCourseEnv) {
super(ureq, wControl);
- this.courseNode = courseNode;
-
-
- Condition accessCondition = courseNode.getPreConditionAccess();
- accessibilityCondContr = new ConditionEditController(ureq, wControl, userCourseEnv,
- accessCondition, AssessmentHelper.getAssessableNodes(course.getEditorTreeModel(), courseNode));
- listenTo(accessibilityCondContr);
OLATResourceable ores = OresHelper.createOLATResourceableInstance(course.getResourceableTypeName(), course.getResourceableId());
editForm = new ViteroBookingsEditController(ureq, wControl, null, ores, courseNode.getIdent(), course.getCourseTitle(), userCourseEnv.isCourseReadOnly());
@@ -105,21 +90,14 @@ public class ViteroEditController extends ActivateableTabbableDefaultController
@Override
protected void event(UserRequest ureq, Controller source, Event event) {
- if (source == accessibilityCondContr) {
- if (event == Event.CHANGED_EVENT) {
- Condition cond = accessibilityCondContr.getCondition();
- courseNode.setPreConditionAccess(cond);
- fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
- }
- } else if (source == editForm) {
+ if (source == editForm) {
//nothing to do
}
}
+ @Override
public void addTabs(TabbedPane tabbedPane) {
tabPane = tabbedPane;
- tabbedPane.addTab(translate(PANE_TAB_ACCESSIBILITY),
- accessibilityCondContr.getWrappedDefaultAccessConditionVC(translate("condition.accessibility.title")));
tabbedPane.addTab(translate(PANE_TAB_VCCONFIG), editVc);
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
index b3c00e4344e..10f1750fbcb 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_de.properties
@@ -1,8 +1,6 @@
error.vmsNotAvailable=$org.olat.modules.vitero.ui\:error.vmsNotAvailable
table.empty=$org.olat.modules.vitero.ui\:table.empty
-pane.tab.accessibility=Zugang
pane.tab.vcconfig=Konfiguration
-condition.accessibility.title=Zugang
title_vc=vitero
guestnoaccess.title=$org.olat.course.nodes\:guestnoaccess.title
-guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
\ No newline at end of file
+guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_en.properties
index 5a8385907fe..5f26d9324dc 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_en.properties
@@ -1,8 +1,6 @@
error.vmsNotAvailable=$org.olat.modules.vitero.ui\:error.vmsNotAvailable
table.empty=$org.olat.modules.vitero.ui\:table.empty
-pane.tab.accessibility=Access
pane.tab.vcconfig=Configuration
-condition.accessibility.title=Access
title_vc=vitero
guestnoaccess.title=$org.olat.course.nodes\:guestnoaccess.title
-guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
\ No newline at end of file
+guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_fr.properties
index 7f60d32e022..5f26d9324dc 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_fr.properties
@@ -1,8 +1,6 @@
error.vmsNotAvailable=$org.olat.modules.vitero.ui\:error.vmsNotAvailable
table.empty=$org.olat.modules.vitero.ui\:table.empty
-pane.tab.accessibility=Acc\u00e8s
pane.tab.vcconfig=Configuration
-condition.accessibility.title=Acc\u00e8s
title_vc=vitero
guestnoaccess.title=$org.olat.course.nodes\:guestnoaccess.title
guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_it.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_it.properties
index 18064745f27..7cc341a5786 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_it.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_it.properties
@@ -1,9 +1,7 @@
#Tue Jul 05 10:45:20 CEST 2016
-condition.accessibility.title=Accesso
error.vmsNotAvailable=$org.olat.modules.vitero.ui\:error.vmsNotAvailable
guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
guestnoaccess.title=$org.olat.course.nodes\:guestnoaccess.title
-pane.tab.accessibility=Accesso
pane.tab.vcconfig=Configurazione
table.empty=$org.olat.modules.vitero.ui\:table.empty
title_vc=vitero
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pl.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pl.properties
index 5511e4e81ca..e69de29bb2d 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pl.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pl.properties
@@ -1 +0,0 @@
-pane.tab.accessibility=Dost\u0119p
diff --git a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pt_BR.properties
index 264aca6f923..200e19ffa91 100644
--- a/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/course/nodes/vitero/_i18n/LocalStrings_pt_BR.properties
@@ -1,9 +1,7 @@
#Tue Apr 03 15:50:58 CEST 2012
-condition.accessibility.title=Acesso
error.vmsNotAvailable=$org.olat.modules.vitero.ui\:error.vmsNotAvailable
guestnoaccess.message=$org.olat.course.nodes\:guestnoaccess.message
guestnoaccess.title=$org.olat.course.nodes\:guestnoaccess.title
-pane.tab.accessibility=Acesso
pane.tab.vcconfig=Configura\u00E7\u00E3o
table.empty=$org.olat.modules.vitero.ui\:table.empty
title_vc=vitero
--
GitLab