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

Merge pull request #3512 from tchak/create-new-procedures-with-administrateurs

Browse source 
Create new procedures with administrateurs
This commit is contained in:
Paul Chavard 2019-02-26 16:46:42 +01:00 • committed by GitHub
commit f6e8ffb582
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,7 +67,7 @@ class Admin::ProceduresController < AdminController
end end
def create def create
@procedure = current_administrateur.admin_procedures.build(procedure_params) @procedure = Procedure.new(procedure_params.merge(administrateurs: [current_administrateur]))
@path = @procedure.path @path = @procedure.path
@availability = Procedure.path_availability(current_administrateur, @procedure.path) @availability = Procedure.path_availability(current_administrateur, @procedure.path)

2
lib/tasks/deployment/20190214101524_add_procedure_administrateur_to_administrateurs.rake → lib/tasks/deployment/20190226101524_add_procedure_administrateur_to_administrateurs.rake
View file

@ -13,6 +13,6 @@ namespace :after_party do
end end
progress.finish progress.finish
AfterParty::TaskRecord.create version: '20190214101524' AfterParty::TaskRecord.create version: '20190226101524'
end end
end end

1
spec/controllers/admin/procedures_controller_spec.rb
View file

@ -197,6 +197,7 @@ describe Admin::ProceduresController, type: :controller do
it { expect(subject.organisation).to eq(organisation) } it { expect(subject.organisation).to eq(organisation) }
it { expect(subject.direction).to eq(direction) } it { expect(subject.direction).to eq(direction) }
it { expect(subject.administrateur_id).to eq(admin.id) } it { expect(subject.administrateur_id).to eq(admin.id) }
it { expect(subject.administrateurs).to eq([admin]) }
it { expect(subject.duree_conservation_dossiers_dans_ds).to eq(duree_conservation_dossiers_dans_ds) } it { expect(subject.duree_conservation_dossiers_dans_ds).to eq(duree_conservation_dossiers_dans_ds) }
it { expect(subject.duree_conservation_dossiers_hors_ds).to eq(duree_conservation_dossiers_hors_ds) } it { expect(subject.duree_conservation_dossiers_hors_ds).to eq(duree_conservation_dossiers_hors_ds) }
end end