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

move WaitingList.empty() to controller

This commit is contained in:
Josh 2017-07-04 14:51:24 -04:00
parent d774200296
commit 9bbb669cc1
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/bbb_controller.rb
View File

@ -92,7 +92,7 @@ class BbbController < ApplicationController
if user if user
if bbb_res[:returncode] && current_user == user if bbb_res[:returncode] && current_user == user
JoinMeetingJob.perform_later(user, params[:id], base_url) JoinMeetingJob.perform_later(user, params[:id], base_url)
WaitingList.empty(options[:room_owner], options[:meeting_name])
# user will be waiting for a moderator # user will be waiting for a moderator
else else
NotifyUserWaitingJob.perform_later(user.encrypted_id, params[:id], params[:name]) NotifyUserWaitingJob.perform_later(user.encrypted_id, params[:id], params[:name])

2
app/lib/bbb_api.rb
View File

@ -100,8 +100,6 @@ module BbbApi
rescue BigBlueButton::BigBlueButtonException => exc rescue BigBlueButton::BigBlueButtonException => exc
logger.info "BBB error on create #{exc.key}: #{exc.message}" logger.info "BBB error on create #{exc.key}: #{exc.message}"
end end
WaitingList.empty(options[:room_owner], options[:meeting_name])
# And then get meeting info # And then get meeting info
bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil ) bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil )