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

Merge pull request #100 from zach-chai/fix_anonymous_meeting 

fix anonymouse meetings
This commit is contained in:
Zachary Chai 2017-01-31 17:00:09 -05:00 committed by GitHub
parent 051a93e175 73debe7c28
commit 9cf8042a69
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/bbb_controller.rb
View File

@ -77,12 +77,14 @@ class BbbController < ApplicationController
)
# the user can join the meeting
if bbb_res[:returncode] && current_user && current_user == user
JoinMeetingJob.perform_later(user.encrypted_id, params[:id])
if bbb_res[:returncode] && user
if current_user == user
JoinMeetingJob.perform_later(user.encrypted_id, params[:id])
# user will be waiting for a moderator
else
NotifyUserWaitingJob.perform_later(user.encrypted_id, params[:id], params[:name])
else
NotifyUserWaitingJob.perform_later(user.encrypted_id, params[:id], params[:name])
end
end
render_bbb_response bbb_res, bbb_res[:response]