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

Merge pull request #7454 from betagouv/fix-procedure-restauration

Browse source 
Fixe la restauration des démarches supprimées
This commit is contained in:
Kara Diaby 2022-06-10 14:31:59 +02:00 committed by GitHub
commit 8fdbbc7f88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/administrateurs/procedures_controller.rb
View file

@ -177,7 +177,7 @@ module Administrateurs
def restore
procedure = current_administrateur.procedures.with_discarded.discarded.find(params[:id])
procedure.restore_procedure
procedure.restore_procedure(current_administrateur)
flash.notice = t('administrateurs.index.restored', procedure_id: procedure.id)
redirect_to admin_procedures_path
end

5
app/models/procedure.rb
View file

@ -707,9 +707,12 @@ class Procedure < ApplicationRecord
end
end
def restore_procedure
def restore_procedure(author)
if discarded?
undiscard
self.dossiers.hidden_by_administration.each do |dossier|
dossier.restore(author)
end
end
end

7
spec/controllers/administrateurs/procedures_controller_spec.rb
View file

@ -785,7 +785,11 @@ describe Administrateurs::ProceduresController, type: :controller do
end
describe 'PUT #restore' do
let(:procedure) { create :procedure, :discarded, administrateur: admin }
let(:procedure) { create :procedure_with_dossiers, :with_service, :published, administrateur: admin }
before do
procedure.discard_and_keep_track!(admin)
end
context 'when the admin wants to restore a procedure' do
before do
@ -794,6 +798,7 @@ describe Administrateurs::ProceduresController, type: :controller do
end
it { expect(procedure.discarded?).to be_falsy }
it { expect(procedure.dossiers.first.hidden_by_administration_at).to be_nil }
end
end
end