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

Revert "4127 fix superadmin supprime compte usager"

Browse source
This commit is contained in:
Pierre de La Morinerie 2020-01-21 18:57:54 +01:00 • committed by GitHub
parent 65a78b682f
commit 751f24f7bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 22 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/user.rb
View file

@ -97,7 +97,7 @@ class User < ApplicationRecord
end
def can_be_deleted?
administrateur.nil? && instructeur.nil? && dossiers.state_instruction_commencee.empty?
dossiers.state_instruction_commencee.empty?
end
def delete_and_keep_track_dossiers(administration)
@ -105,11 +105,12 @@ class User < ApplicationRecord
raise "Cannot delete this user because instruction has started for some dossiers"
end
dossiers.each do |dossier|
dossier.delete_and_keep_track(administration)
if can_be_deleted?
dossiers.each do |dossier|
dossier.delete_and_keep_track(administration)
end
destroy
end
dossiers.unscoped.destroy_all
destroy!
end
private