Skip to content
Snippets Groups Projects
Commit fcce3fe2 authored by srosse's avatar srosse
Browse files

OO-4584: fix rs edit permanent meeting

parent ba810b5a
No related branches found
No related tags found
No related merge requests found
...@@ -103,11 +103,15 @@ public class BigBlueButtonModule extends AbstractSpringModule implements ConfigO ...@@ -103,11 +103,15 @@ public class BigBlueButtonModule extends AbstractSpringModule implements ConfigO
contextPath = getStringPropertyValue(PROP_CONTEXTPATH, contextPath); contextPath = getStringPropertyValue(PROP_CONTEXTPATH, contextPath);
secret = getStringPropertyValue(PROP_SECRET, secret); secret = getStringPropertyValue(PROP_SECRET, secret);
sharedSecret = getStringPropertyValue(PROP_SHARED_SECRET, sharedSecret); 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); String bandwidthReqObj = getStringPropertyValue(PROP_USER_BANDWIDTH_REQUIREMENT, true);
if(StringHelper.containsNonWhitespace(bandwidthReqObj)) { if(StringHelper.containsNonWhitespace(bandwidthReqObj)) {
userBandwidhtRequirement = Double.parseDouble(bandwidthReqObj); userBandwidhtRequirement = Double.parseDouble(bandwidthReqObj);
} }
} }
@Override @Override
......
...@@ -175,7 +175,7 @@ public class EditBigBlueButtonMeetingController extends FormBasicController { ...@@ -175,7 +175,7 @@ public class EditBigBlueButtonMeetingController extends FormBasicController {
leadTimeEl = uifactory.addTextElement("meeting.leadTime", 8, leadtime, formLayout); leadTimeEl = uifactory.addTextElement("meeting.leadTime", 8, leadtime, formLayout);
Date endDate = meeting == null ? null : meeting.getEndDate(); Date endDate = meeting == null ? null : meeting.getEndDate();
if (endDate == null) { if (endDate == null && startDate != null) {
// set meeting time default to 1 hour // set meeting time default to 1 hour
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(startDate); calendar.setTime(startDate);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment