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

Merge pull request #8585 from colinux/fix-procedure-draft-delete-dossiers

Browse source 
fix(dossier/démarche en test): peut détruire des dossiers référencés dans des opérations de masse
This commit is contained in:
Colin Darie 2023-02-08 14:49:12 +01:00 committed by GitHub
commit ea51e7d3f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/administrateurs/administrateur_controller.rb
View file

@ -7,6 +7,10 @@ module Administrateurs
id = params[:procedure_id] || params[:id] id = params[:procedure_id] || params[:id]
@procedure = current_administrateur.procedures.find(id) @procedure = current_administrateur.procedures.find(id)
Sentry.configure_scope do |scope|
scope.set_tags(procedure: @procedure.id)
end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
flash.alert = 'Démarche inexistante' flash.alert = 'Démarche inexistante'
redirect_to admin_procedures_path, status: 404 redirect_to admin_procedures_path, status: 404

2
app/models/dossier.rb
View file

@ -147,7 +147,7 @@ class Dossier < ApplicationRecord
belongs_to :user, optional: true belongs_to :user, optional: true
belongs_to :parent_dossier, class_name: 'Dossier', optional: true belongs_to :parent_dossier, class_name: 'Dossier', optional: true
belongs_to :batch_operation, optional: true belongs_to :batch_operation, optional: true
has_many :dossier_batch_operations has_many :dossier_batch_operations, dependent: :destroy
has_many :batch_operations, through: :dossier_batch_operations has_many :batch_operations, through: :dossier_batch_operations
has_one :france_connect_information, through: :user has_one :france_connect_information, through: :user