master #1

Merged
lino.jorzick merged 203 commits from External/greenlight:master into master 2021-10-02 18:19:43 +00:00
Showing only changes of commit fc06994d1f - Show all commits

View File

@ -435,10 +435,11 @@ class RoomsController < ApplicationController
def record_meeting
# If the require consent setting is checked, then check the room setting, else, set to true
user = current_user || @room.owner
if recording_consent_required?
room_setting_with_config("recording") && current_user&.role&.get_permission("can_launch_recording")
room_setting_with_config("recording") && user&.role&.get_permission("can_launch_recording")
else
current_user&.role&.get_permission("can_launch_recording")
user&.role&.get_permission("can_launch_recording")
end
end