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

GRN2-xx: Fixed issue with join warning displaying incorrectly (#1957)

Browse Source 
* Fixed issue with room settings

* Update room join consent string
This commit is contained in:
Ahmad Farhat
2020-07-30 10:50:04 -04:00
committed by GitHub
parent af8c78fdee
commit ec93d5e472
6 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,31 +94,6 @@ module Joiner
}
end
# Gets the room setting based on the option set in the room configuration
def room_setting_with_config(name)
config = case name
when "muteOnStart"
"Room Configuration Mute On Join"
when "requireModeratorApproval"
"Room Configuration Require Moderator"
when "joinModerator"
"Room Configuration All Join Moderator"
when "anyoneCanStart"
"Room Configuration Allow Any Start"
when "recording"
"Room Configuration Recording"
end
case @settings.get_value(config)
when "enabled"
true
when "optional"
@room_settings[name]
when "disabled"
false
end
end
private
def fetch_guest_id

28
app/controllers/rooms_controller.rb
View File

@ -62,7 +62,7 @@ class RoomsController < ApplicationController
# GET /:room_uid
def show
@room_settings = @room[:room_settings]
@room_settings = JSON.parse(@room[:room_settings])
@anyone_can_start = room_setting_with_config("anyoneCanStart")
@room_running = room_running?(@room.bbb_id)
@shared_room = room_shared_with_user
@ -420,4 +420,30 @@ class RoomsController < ApplicationController
def valid_file_type
Rails.configuration.allowed_file_types.split(",").include?(File.extname(room_params[:presentation].original_filename))
end
# Gets the room setting based on the option set in the room configuration
def room_setting_with_config(name)
config = case name
when "muteOnStart"
"Room Configuration Mute On Join"
when "requireModeratorApproval"
"Room Configuration Require Moderator"
when "joinModerator"
"Room Configuration All Join Moderator"
when "anyoneCanStart"
"Room Configuration Allow Any Start"
when "recording"
"Room Configuration Recording"
end
case @settings.get_value(config)
when "enabled"
true
when "optional"
@room_settings[name]
when "disabled"
false
end
end
helper_method :room_setting_with_config
end