forked from External/greenlight
Make room delete permanent (#2390)
This commit is contained in:
@ -137,7 +137,10 @@ class RoomsController < ApplicationController
|
||||
begin
|
||||
# Don't delete the users home room.
|
||||
raise I18n.t("room.delete.home_room") if @room == @room.owner.main_room
|
||||
@room.destroy
|
||||
|
||||
# Destroy all recordings then permanently delete the room
|
||||
delete_all_recordings(@room.bbb_id)
|
||||
@room.destroy(true)
|
||||
rescue => e
|
||||
flash[:alert] = I18n.t("room.delete.fail", error: e)
|
||||
else
|
||||
|
@ -155,6 +155,8 @@ class UsersController < ApplicationController
|
||||
# Permanently delete the rooms under the user if they have not been reassigned
|
||||
if perm_delete
|
||||
@user.rooms.include_deleted.each do |room|
|
||||
# Destroy all recordings then permanently delete the room
|
||||
delete_all_recordings(room.bbb_id)
|
||||
room.destroy(true)
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user