From d4249c38e4134685cf4926e53949b8006a611b14 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 25 Mar 2020 18:22:51 +0100
Subject: [PATCH] OO-4584: wording and fix course element configuration
---
.../course/nodes/bigbluebutton/BigBlueButtonConfigForm.java | 2 +-
.../bigbluebutton/ui/BigBlueButtonConfigurationController.java | 2 +-
.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java | 1 -
.../modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties | 1 -
.../modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties | 1 -
.../modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties | 1 -
.../bigbluebutton/ui/_i18n/LocalStrings_pt_BR.properties | 1 -
7 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java b/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java
index 8b50b719ca7..c828ab44615 100644
--- a/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java
+++ b/src/main/java/org/olat/course/nodes/bigbluebutton/BigBlueButtonConfigForm.java
@@ -75,7 +75,7 @@ public class BigBlueButtonConfigForm extends FormBasicController {
@Override
protected void formOK(UserRequest ureq) {
Collection<String> selectedKeys = accessEl.getSelectedKeys();
- config.setBooleanEntry(BigBlueButtonEditController.MODERATOR_START_MEETING, !selectedKeys.contains(accessKeys[0]));
+ config.setBooleanEntry(BigBlueButtonEditController.MODERATOR_START_MEETING, selectedKeys.contains(accessKeys[0]));
fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
}
}
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonConfigurationController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonConfigurationController.java
index 7687ed7b942..56a5191bb6d 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonConfigurationController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/BigBlueButtonConfigurationController.java
@@ -136,7 +136,7 @@ public class BigBlueButtonConfigurationController extends FormBasicController {
private void updateUI() {
boolean enabled = moduleEnabled.isAtLeastSelected(1);
- adhocForEl.setVisible(enabled);
+ adhocForEl.setVisible(false);
permanentForEl.setVisible(enabled);
enabledForEl.setVisible(enabled);
checkLink.setVisible(enabled);
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
index bace9acb687..2a276e53b9b 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
@@ -163,7 +163,6 @@ public class EditBigBlueButtonMeetingController extends FormBasicController {
permanentEl.addActionListener(FormEvent.ONCHANGE);
boolean permanent = meeting != null && bigBlueButtonModule.isPermanentMeetingEnabled() && meeting.isPermanent();
permanentEl.select(permKeys[0], permanent);
- permanentEl.setHelpTextKey("meeting.permanent.explain", null);
permanentEl.setVisible(bigBlueButtonModule.isPermanentMeetingEnabled());
Date startDate = meeting == null ? null : meeting.getStartDate();
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
index 61618942d45..18778d87e1a 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_de.properties
@@ -42,7 +42,6 @@ meeting.leadTime=Vorlaufzeit (Min.)
meeting.name=Name
meeting.no.template=Standardeinstellungen
meeting.permanent=Typ
-meeting.permanent.explain=Meetings vom Typ "Dauernd" teilen sich den gleichen Meetingraum in einem Kursbaustein oder einer Gruppe.
meeting.permanent.on=Dauernd
meeting.resource=Resource
meeting.start=Beginn
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
index eaafe1495b5..23beb3a2625 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_en.properties
@@ -42,7 +42,6 @@ meeting.leadTime=Prep time (min.)
meeting.name=Name
meeting.no.template=Default settings
meeting.permanent=Typ
-meeting.permanent.explain=Permanent meetings will share the same meeting room within a course element or a group.
meeting.permanent.on=Permanent
meeting.resource=Resource
meeting.start=Start date
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
index b34fdf6d533..9f217247d3b 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_fr.properties
@@ -35,7 +35,6 @@ meeting.leadTime=Pr\u00E9paration (min.)
meeting.name=Nom
meeting.no.template=Configuration par d\u00E9faut
meeting.permanent=Type
-meeting.permanent.explain=Les meetings permanents partagent la m\u00EAme salle de r\u00E9union au sein d'un \u00E9l\u00E9ment de cours ou d'un groupe.
meeting.permanent.on=Permanent
meeting.resource=Ressource
meeting.start=Date de d\u00E9but
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_pt_BR.properties
index 060308cb8b0..18fbf0e4175 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_pt_BR.properties
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/_i18n/LocalStrings_pt_BR.properties
@@ -49,7 +49,6 @@ meeting.join.button=Junte-se \u00E0 reuni\u00E3o
meeting.leadTime=Tempo de prepara\u00E7\u00E3o (min.)
meeting.name=Nome
meeting.permanent=Tipo
-meeting.permanent.explain=As reuni\u00F5es permanentes compartilhar\u00E3o a mesma sala de reuni\u00E3o dentro de um elemento do curso ou de um grupo.
meeting.permanent.on=Permanente
meeting.register.button=Registro
meeting.resource=Recurso
--
GitLab