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

Replaced checkbox with dropdown (#552)

Browse Source
This commit is contained in:
farhatahmad
2019-05-23 13:21:43 -04:00
committed by GitHub
parent de1e75fbf8
commit 3e0238eb0c
11 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/controllers/rooms_controller.rb
View File

@ -98,8 +98,8 @@ class RoomsController < ApplicationController
# POST /:room_uid
def join
# If this setting is turned on only authenticated users are allowed to join rooms
room_authentication_required
return redirect_to root_path,
flash: { alert: I18n.t("administrator.site_settings.authentication.user-info") } if auth_required
opts = default_meeting_options
unless @room.owned_by?(current_user)
@ -275,11 +275,8 @@ class RoomsController < ApplicationController
redirect_to admins_path if current_user && current_user&.has_role?(:super_admin)
end
def room_authentication_required
if Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Authentication") == "true" &&
current_user.nil?
flash[:alert] = I18n.t("administrator.site_settings.authentication.user-info")
redirect_to signin_path
end
def auth_required
Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Authentication") == "true" &&
current_user.nil?
end
end