DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Revert "Merge pull request #5576 from tchak/soft-delete-users"

Browse source 
This reverts commit bf0d3914ce, reversing
changes made to 503527459e.
This commit is contained in:
clemkeirua 2020-09-17 15:39:16 +02:00
parent e0834bf4f5
commit 0307beecd6
5 changed files with 5 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/manager/users_controller.rb
View file

@ -1,10 +1,5 @@
module Manager
class UsersController < Manager::ApplicationController
def scoped_resource
# Don't display discarded users
User.kept
end
def update
user = User.find(params[:id])
new_email = params[:user][:email]
@ -41,10 +36,10 @@ module Manager
def delete
user = User.find(params[:id])
if !user.can_be_discarded?
fail "Impossible de supprimer cet utilisateur. Il est instructeur ou administrateur."
if !user.can_be_deleted?
fail "Impossible de supprimer cet utilisateur. Il a des dossiers en instruction ou il est administrateur."
end
user.delete_or_discard!(current_administration)
user.delete_and_keep_track_dossiers(current_administration)
logger.info("L'utilisateur #{user.id} est supprimé par #{current_administration.id}")
flash[:notice] = "L'utilisateur #{user.id} est supprimé"