lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Co-authored-by: Tobias Fiebig <t.fiebig@tudelft.nl> (#1296)

Browse Source 
Co-authored-by: Ahmad Farhat <ahmad.af.farhat@gmail.com>
This commit is contained in:
yanosz
2020-06-29 19:43:12 +02:00
committed by GitHub
parent 9a96df6a37
commit 2e4010aed8
12 changed files with 109 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/concerns/joiner.rb
View File

@ -87,7 +87,7 @@ module Joiner
{
user_is_moderator: false,
meeting_logout_url: request.base_url + logout_room_path(@room),
meeting_recorded: true,
meeting_recorded: @room.recording?,
moderator_message: "#{invite_msg}\n\n#{request.base_url + room_path(@room)}",
host: request.host,
recording_default_visibility: @settings.get_value("Default Recording Visibility") == "public"
@ -105,6 +105,8 @@ module Joiner
"Room Configuration All Join Moderator"
when "anyoneCanStart"
"Room Configuration Allow Any Start"
when "recording"
"Room Configuration Recording"
end
case @settings.get_value(config)

10
app/controllers/rooms_controller.rb
View File

@ -171,7 +171,7 @@ class RoomsController < ApplicationController
@room_settings = JSON.parse(@room[:room_settings])
opts[:mute_on_start] = room_setting_with_config("muteOnStart")
opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval")
opts[:record] = room_setting_with_config("recording")
begin
redirect_to join_path(@room, current_user.name, opts, current_user.uid)
rescue BigBlueButton::BigBlueButtonException => e
@ -261,8 +261,10 @@ class RoomsController < ApplicationController
# GET /:room_uid/room_settings
def room_settings
# Respond with JSON object of the room_settings
status = { running: room_running?(@room.bbb_id) }
settings = @room.settings_hash
respond_to do |format|
format.json { render body: @room.room_settings.to_json }
format.json { render body: status.merge(settings).to_json }
end
end
@ -291,6 +293,7 @@ class RoomsController < ApplicationController
"requireModeratorApproval": options[:require_moderator_approval] == "1",
"anyoneCanStart": options[:anyone_can_start] == "1",
"joinModerator": options[:all_join_moderator] == "1",
"recording": options[:recording] == "1",
}
room_settings.to_json
@ -298,7 +301,8 @@ class RoomsController < ApplicationController
def room_params
params.require(:room).permit(:name, :auto_join, :mute_on_join, :access_code,
:require_moderator_approval, :anyone_can_start, :all_join_moderator)
:require_moderator_approval, :anyone_can_start, :all_join_moderator,
:recording)
end
# Find the room from the uid.