diff --git a/app/controllers/new_user/dossiers_controller.rb b/app/controllers/new_user/dossiers_controller.rb index b027cda03..44b0faef4 100644 --- a/app/controllers/new_user/dossiers_controller.rb +++ b/app/controllers/new_user/dossiers_controller.rb @@ -103,9 +103,7 @@ module NewUser dossier = current_user.dossiers.includes(:user, procedure: :administrateur).find(params[:id]) if !dossier.instruction_commencee? - deleted_dossier = dossier.delete_and_keep_track - DossierMailer.notify_deletion_to_user(deleted_dossier, dossier.user.email).deliver_later - DossierMailer.notify_deletion_to_administration(deleted_dossier, dossier.procedure.administrateur.email).deliver_later + dossier.delete_and_keep_track flash.notice = 'Votre dossier a bien été supprimé.' redirect_to users_dossiers_path else diff --git a/app/models/dossier.rb b/app/models/dossier.rb index d3b4cf36b..d91a33d36 100644 --- a/app/models/dossier.rb +++ b/app/models/dossier.rb @@ -280,7 +280,8 @@ class Dossier < ApplicationRecord now = Time.now deleted_dossier = DeletedDossier.create!(dossier_id: id, procedure: procedure, state: state, deleted_at: now) update(hidden_at: now) - deleted_dossier + DossierMailer.notify_deletion_to_user(deleted_dossier, user.email).deliver_later + DossierMailer.notify_deletion_to_administration(deleted_dossier, procedure.administrateur.email).deliver_later end private