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

Merge pull request #135 from zach-chai/fix_delete 

Fix delete
This commit is contained in:
Zachary Chai 2017-02-28 10:45:46 -05:00 committed by GitHub
parent c96e5d3ba3 a72656465b
commit 7bb1340fef
4 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/recordings.coffee
View File

@ -249,7 +249,7 @@ class @Recordings
url: url+'/'+id, url: url+'/'+id,
data: data data: data
}).done((data) -> }).done((data) ->
btn.prop('disabled', false)
).fail((data) -> ).fail((data) ->
btn.prop('disabled', false) btn.prop('disabled', false)
) )
@ -264,7 +264,7 @@ class @Recordings
method: 'DELETE', method: 'DELETE',
url: url+'/'+id url: url+'/'+id
}).done((data) -> }).done((data) ->
btn.prop('disabled', false)
).fail((data) -> ).fail((data) ->
btn.prop('disabled', false) btn.prop('disabled', false)
) )

3
app/controllers/bbb_controller.rb
View File

@ -159,9 +159,10 @@ class BbbController < ApplicationController
# DELETE /rooms/:id/recordings/:record_id # DELETE /rooms/:id/recordings/:record_id
# DELETE /rooms/:room_id/:id/recordings/:record_id # DELETE /rooms/:room_id/:id/recordings/:record_id
def delete_recordings def delete_recordings
recording = bbb_get_recordings({recordID: params[:record_id]})[:recordings].first
bbb_res = bbb_delete_recordings(params[:record_id]) bbb_res = bbb_delete_recordings(params[:record_id])
if bbb_res[:returncode] if bbb_res[:returncode]
RecordingDeletesJob.perform_later(@user.encrypted_id, params[:record_id], params[:id]) RecordingDeletesJob.perform_later(@user.encrypted_id, params[:record_id], recording[:metadata][:"meeting-name"])
end end
render_bbb_response bbb_res render_bbb_response bbb_res
end end

27
app/jobs/recording_deletes_job.rb
View File

@ -20,25 +20,12 @@ class RecordingDeletesJob < ApplicationJob
queue_as :default queue_as :default
def perform(room, record_id, meeting=nil) def perform(room, record_id, meeting=nil)
tries = 0 full_id = "#{room}-#{meeting}"
sleep_time = 2 ActionCable.server.broadcast "#{room}_recording_updates_channel",
action: 'delete',
while tries < 4 id: record_id
bbb_res = bbb_get_recordings({recordID: record_id}) ActionCable.server.broadcast "#{full_id}_recording_updates_channel",
if !bbb_res[:recordings] || bbb_res[:messageKey] == 'noRecordings' action: 'delete',
full_id = room id: record_id
full_id += "-#{recording[:metadata][:"meeting-name"]}"
ActionCable.server.broadcast "#{room}_recording_updates_channel",
action: 'delete',
id: record_id
ActionCable.server.broadcast "#{full_id}_recording_updates_channel",
action: 'delete',
id: record_id
break
end
sleep sleep_time
sleep_time = sleep_time * 2
tries += 1
end
end end
end end

4
config/locales/en-us.yml
View File

@ -104,7 +104,7 @@ en-US:
moderator_default_message: Invitation link - %{url} moderator_default_message: Invitation link - %{url}
my_room: my room my_room: my room
name: Name name: Name
no: No 'no': 'No'
notification_mailer: notification_mailer:
recording_ready_email: recording_ready_email:
closing: "Regards,... BigBlueButton" closing: "Regards,... BigBlueButton"
@ -143,4 +143,4 @@ en-US:
wait_for_mod_msg: Looks like you're the first one here... wait_for_mod_msg: Looks like you're the first one here...
wait_for_mod_explanation: You will automatically join when the meeting starts wait_for_mod_explanation: You will automatically join when the meeting starts
watch: Watch watch: Watch
yes: Yes 'yes': 'Yes'