From 3011e4ecd75b8616713b75b0ba091833a06c8982 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Fri, 24 Apr 2020 11:27:22 +0200
Subject: [PATCH] OO-4584: Show tab "access" in BigBlueBotton course element
again
---
.../course/nodes/BigBlueButtonCourseNode.java | 8 ++++-
.../BigBlueButtonEditController.java | 34 +++----------------
.../nodes/bigbluebutton/_content/edit.html | 1 -
.../_i18n/LocalStrings_de.properties | 1 -
.../_i18n/LocalStrings_en.properties | 1 -
.../_i18n/LocalStrings_fr.properties | 1 -
6 files changed, 11 insertions(+), 35 deletions(-)
delete mode 100644 src/main/java/org/olat/course/nodes/bigbluebutton/_content/edit.html
diff --git a/src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java b/src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java
index 51c12c70e24..fd37753651a 100644
--- a/src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/BigBlueButtonCourseNode.java
@@ -33,6 +33,7 @@ import org.olat.core.id.Roles;
import org.olat.core.util.Util;
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;
@@ -85,7 +86,7 @@ public class BigBlueButtonCourseNode extends AbstractAccessableCourseNode {
ICourse course, UserCourseEnvironment userCourseEnv) {
CourseNode chosenNode = course.getEditorTreeModel().getCourseNode(userCourseEnv.getCourseEditorEnv().getCurrentCourseNodeId());
// create edit controller
- BigBlueButtonEditController childTabCtrl = new BigBlueButtonEditController(ureq, wControl, this, course, userCourseEnv);
+ BigBlueButtonEditController childTabCtrl = new BigBlueButtonEditController(ureq, wControl, this);
NodeEditController nodeEditCtr = new NodeEditController(ureq, wControl, course, chosenNode,
userCourseEnv, childTabCtrl);
@@ -93,6 +94,11 @@ public class BigBlueButtonCourseNode 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/bigbluebutton/BigBlueButtonEditController.java b/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonEditController.java
index 060ddd44c2c..b7ede8ee98c 100644
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonEditController.java
+++ b/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonEditController.java
@@ -22,18 +22,12 @@ package org.olat.course.nodes.bigbluebutton;
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;
import org.olat.core.gui.control.generic.tabbable.ActivateableTabbableDefaultController;
-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.BigBlueButtonCourseNode;
-import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.ModuleConfiguration;
/**
@@ -48,23 +42,17 @@ public class BigBlueButtonEditController extends ActivateableTabbableDefaultCont
public static final String GUEST_ACCESS_ALLOWED = "guestAccessAllowed";
public static final String MODERATOR_START_MEETING = "moderatorStartMeeting";
- private static final String PANE_TAB_ACCESSIBILITY = "pane.tab.accessibility";
public static final String PANE_TAB_VCCONFIG = "pane.tab.vcconfig";
- private static final String[] paneKeys = { PANE_TAB_VCCONFIG, PANE_TAB_ACCESSIBILITY };
+ private static final String[] paneKeys = { PANE_TAB_VCCONFIG };
private TabbedPane tabPane;
- private final VelocityContainer myContent;
private BigBlueButtonConfigForm configCtrl;
- private ConditionEditController accessibilityCondContr;
private final ModuleConfiguration config;
- private final BigBlueButtonCourseNode courseNode;
- public BigBlueButtonEditController(UserRequest ureq, WindowControl wControl, BigBlueButtonCourseNode courseNode,
- ICourse course, UserCourseEnvironment userCourseEnv) {
+ public BigBlueButtonEditController(UserRequest ureq, WindowControl wControl, BigBlueButtonCourseNode courseNode) {
super(ureq, wControl);
- this.courseNode = courseNode;
config = courseNode.getModuleConfiguration();
String providerId = config.getStringValue("vc_provider_id");
@@ -72,16 +60,8 @@ public class BigBlueButtonEditController extends ActivateableTabbableDefaultCont
showWarning("wimba.not.supported.message");
}
- Condition accessCondition = courseNode.getPreConditionAccess();
- accessibilityCondContr = new ConditionEditController(ureq, wControl, userCourseEnv,
- accessCondition, AssessmentHelper.getAssessableNodes(course.getEditorTreeModel(), courseNode));
- listenTo(accessibilityCondContr);
-
- myContent = createVelocityContainer("edit");
-
configCtrl = new BigBlueButtonConfigForm(ureq, getWindowControl(), config);
listenTo(configCtrl);
- myContent.put("configuration", configCtrl.getInitialComponent());
}
@Override
@@ -106,13 +86,7 @@ public class BigBlueButtonEditController extends ActivateableTabbableDefaultCont
@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 == configCtrl) {
+ if (source == configCtrl) {
if (event == Event.CANCELLED_EVENT) {
// do nothing
} else if (event == Event.DONE_EVENT || event == NodeEditController.NODECONFIG_CHANGED_EVENT) {
@@ -124,6 +98,6 @@ public class BigBlueButtonEditController extends ActivateableTabbableDefaultCont
@Override
public void addTabs(TabbedPane tabbedPane) {
tabPane = tabbedPane;
- tabbedPane.addTab(translate(PANE_TAB_VCCONFIG), myContent);
+ tabbedPane.addTab(translate(PANE_TAB_VCCONFIG), configCtrl.getInitialComponent());
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/nodes/bigbluebutton/_content/edit.html b/src/main/java/org/olat/course/nodes/bigbluebutton/_content/edit.html
deleted file mode 100644
index f29500cf361..00000000000
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/_content/edit.html
+++ /dev/null
@@ -1 +0,0 @@
-$r.render("configuration")
diff --git a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_de.properties
index 3617cc17a16..bf9c2407530 100644
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_de.properties
@@ -2,7 +2,6 @@
condition.accessibility.title=Zugang
guest.allowed=Zutritt
moderator.start.meeting=Meeting \u00F6ffnen
-pane.tab.accessibility=Zugang
pane.tab.vcconfig=Konfiguration
title_vc=BigBlueButton
vc.access.label=Zugang
diff --git a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_en.properties
index b3853852a53..810fd7bf01e 100644
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_en.properties
@@ -2,7 +2,6 @@
condition.accessibility.title=Access
guest.allowed=Access
moderator.start.meeting=Room opening
-pane.tab.accessibility=Access
pane.tab.vcconfig=Configuration
title_vc=BigBlueButton
vc.access.label=Access authorisation
diff --git a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_fr.properties
index f774f22b731..1d17a6209c3 100644
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/nodes/bigbluebutton/_i18n/LocalStrings_fr.properties
@@ -2,7 +2,6 @@
condition.accessibility.title=Acc\u00E8s
guest.allowed=Acc\u00E8s
moderator.start.meeting=Ouvrir le meeting
-pane.tab.accessibility=Acc\u00E8s
pane.tab.vcconfig=Configuration
title_vc=BigBlueButton
vc.access.label=Autorisation d'acc\u00E8s
--
GitLab