GRN2-xx: Users, Room and Recordings are now no longer permanently deleted (#773)

* Bug fixes for 2.4

* Removed accidental code add

* Switched from deleting to tombstoning

* Fixed bug with login
This commit is contained in:
farhatahmad
2019-08-28 16:28:42 -04:00
committed by farhatahmad
parent 666231db6c
commit d3b669d552
10 changed files with 90 additions and 12 deletions

View File

@ -195,6 +195,7 @@ class AdminsController < ApplicationController
role.priority <= current_user.highest_priority_role.priority
return redirect_to admin_roles_path(selected_role: role.id)
else
role.role_permissions.delete_all
role.delete
end

View File

@ -140,10 +140,7 @@ class RoomsController < ApplicationController
# DELETE /:room_uid
def destroy
# Don't delete the users home room.
if @room.owned_by?(current_user) && @room != current_user.main_room
@room.destroy
delete_all_recordings(@room.bbb_id)
end
@room.destroy if @room.owned_by?(current_user) && @room != current_user.main_room
redirect_to current_user.main_room
end

View File

@ -30,7 +30,6 @@ class SessionsController < ApplicationController
def signin
check_if_twitter_account
providers = configured_providers
if one_provider
provider_path = if Rails.configuration.omniauth_ldap
ldap_signin_path
@ -147,6 +146,8 @@ class SessionsController < ApplicationController
end
def one_provider
providers = configured_providers
(!allow_user_signup? || !allow_greenlight_accounts?) && providers.count == 1 &&
!Rails.configuration.loadbalanced_configuration
end