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

Merge pull request #2 from joshua-arts/join_as_mod 

Always join room owners as moderators.
This commit is contained in:
Joshua Arts 2018-06-26 16:22:08 -04:00 committed by GitHub
parent c348bd6bb1 60d8a595f0
commit 3748bb2140
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/rooms_controller.rb
View File

@ -37,15 +37,20 @@ class RoomsController < ApplicationController
def join
opts = default_meeting_options
# Assign join name if passed.
if params[@room.invite_path]
@join_name = params[@room.invite_path][:join_name]
elsif !params[:join_name]
# Join name not passed.
return
unless @room.owned_by?(current_user)
# Assign join name if passed.
if params[@room.invite_path]
@join_name = params[@room.invite_path][:join_name]
elsif !params[:join_name]
# Join name not passed.
return
end
end
if @room.running?
# Determine if the user needs to join as a moderator.
opts[:user_is_moderator] = @room.owned_by?(current_user)
if current_user
redirect_to @room.join_path(current_user.name, opts, current_user.uid)
else