BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix breaking closeCaption on disabling sharedNotes

Browse Source
This commit is contained in:
Gustavo Trott 2022-03-10 08:56:12 -03:00
parent 537704ef0e
commit ad95126912
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadCreateGroupReqMsgHdlr.scala
View File

@ -21,7 +21,15 @@ trait PadCreateGroupReqMsgHdlr {
bus.outGW.send(msgEvent)
}
if (!Pads.hasGroup(liveMeeting.pads, msg.body.externalId)) {
val padEnabled = {
if (msg.body.externalId == "notes" && liveMeeting.props.meetingProp.disabledFeatures.contains("sharedNotes")) {
false
} else {
true
}
}
if (padEnabled && !Pads.hasGroup(liveMeeting.pads, msg.body.externalId)) {
Pads.addGroup(liveMeeting.pads, msg.body.externalId, msg.body.model, msg.body.name, msg.header.userId)
broadcastEvent(msg.body.externalId, msg.body.model)
}

7
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/pads/PadCreateSessionReqMsgHdlr.scala
View File

@ -1,7 +1,6 @@
package org.bigbluebutton.core.apps.pads
import org.bigbluebutton.common2.msgs._
import org.bigbluebutton.core.apps.PermissionCheck
import org.bigbluebutton.core.bus.MessageBus
import org.bigbluebutton.core.models.Pads
import org.bigbluebutton.core.running.LiveMeeting
@ -22,11 +21,7 @@ trait PadCreateSessionReqMsgHdlr {
bus.outGW.send(msgEvent)
}
if (liveMeeting.props.meetingProp.disabledFeatures.contains("sharedNotes")) {
val meetingId = liveMeeting.props.meetingProp.intId
val reason = "Shared Notes disabled for this meeting."
PermissionCheck.ejectUserForFailedPermission(meetingId, msg.header.userId, reason, bus.outGW, liveMeeting)
} else if (Pads.hasAccess(liveMeeting, msg.body.externalId, msg.header.userId)) {
if (Pads.hasAccess(liveMeeting, msg.body.externalId, msg.header.userId)) {
Pads.getGroup(liveMeeting.pads, msg.body.externalId) match {
case Some(group) => broadcastEvent(group.groupId, msg.header.userId)
case _ =>