From fcce3fe23de208b5a9718e2c9d1bd80f9eec01ab Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 26 Mar 2020 08:02:28 +0100
Subject: [PATCH] OO-4584: fix rs edit permanent meeting
---
.../org/olat/modules/bigbluebutton/BigBlueButtonModule.java | 4 ++++
.../bigbluebutton/ui/EditBigBlueButtonMeetingController.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java b/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
index 2825e7950a4..4012847b407 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
@@ -103,11 +103,15 @@ public class BigBlueButtonModule extends AbstractSpringModule implements ConfigO
contextPath = getStringPropertyValue(PROP_CONTEXTPATH, contextPath);
secret = getStringPropertyValue(PROP_SECRET, secret);
sharedSecret = getStringPropertyValue(PROP_SHARED_SECRET, sharedSecret);
+ adhocMeetingEnabled = getStringPropertyValue(PROP_ADHOC_MEETING, adhocMeetingEnabled);
+ permanentMeetingEnabled = getStringPropertyValue(PROP_PERMANENT_MEETING, permanentMeetingEnabled);
String bandwidthReqObj = getStringPropertyValue(PROP_USER_BANDWIDTH_REQUIREMENT, true);
if(StringHelper.containsNonWhitespace(bandwidthReqObj)) {
userBandwidhtRequirement = Double.parseDouble(bandwidthReqObj);
}
+
+
}
@Override
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 d47862050cd..45228353790 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
@@ -175,7 +175,7 @@ public class EditBigBlueButtonMeetingController extends FormBasicController {
leadTimeEl = uifactory.addTextElement("meeting.leadTime", 8, leadtime, formLayout);
Date endDate = meeting == null ? null : meeting.getEndDate();
- if (endDate == null) {
+ if (endDate == null && startDate != null) {
// set meeting time default to 1 hour
Calendar calendar = Calendar.getInstance();
calendar.setTime(startDate);
--
GitLab