From 9341c787a1f5a6ed0128ebf96fe74ed6faf30ae6 Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Wed, 1 Dec 2021 21:38:41 +0100 Subject: [PATCH] administrateur can add zone to procedure --- app/controllers/administrateurs/procedures_controller.rb | 2 +- .../administrateurs/procedures/_informations.html.haml | 5 +++++ .../administrateurs/procedures_controller_spec.rb | 2 ++ spec/factories/zone.rb | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 spec/factories/zone.rb diff --git a/app/controllers/administrateurs/procedures_controller.rb b/app/controllers/administrateurs/procedures_controller.rb index f01c15556..08f39c5ec 100644 --- a/app/controllers/administrateurs/procedures_controller.rb +++ b/app/controllers/administrateurs/procedures_controller.rb @@ -251,7 +251,7 @@ module Administrateurs end def procedure_params - editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :cadre_juridique, :deliberation, :notice, :web_hook_url, :declarative_with_state, :logo, :auto_archive_on, :monavis_embed, :api_entreprise_token, :duree_conservation_dossiers_dans_ds] + editable_params = [:libelle, :description, :organisation, :direction, :lien_site_web, :cadre_juridique, :deliberation, :notice, :web_hook_url, :declarative_with_state, :logo, :auto_archive_on, :monavis_embed, :api_entreprise_token, :duree_conservation_dossiers_dans_ds, :zone_id] permited_params = if @procedure&.locked? params.require(:procedure).permit(*editable_params) else diff --git a/app/views/administrateurs/procedures/_informations.html.haml b/app/views/administrateurs/procedures/_informations.html.haml index d48d963cd..7cc1a1ec5 100644 --- a/app/views/administrateurs/procedures/_informations.html.haml +++ b/app/views/administrateurs/procedures/_informations.html.haml @@ -13,6 +13,11 @@ %span.mandatory * = f.text_area :description, rows: '6', placeholder: 'Description de la démarche, destinataires, etc. ', class: 'form-control' += f.label :zone do + Organisme qui met en oeuvre la démarche + %span.mandatory * += f.collection_select :zone_id, Zone.order(:label), :id, :label, prompt: true + %h3.header-subsection Logo de la démarche = image_upload_and_render f, @procedure.logo diff --git a/spec/controllers/administrateurs/procedures_controller_spec.rb b/spec/controllers/administrateurs/procedures_controller_spec.rb index ce5f5f0f6..378910d35 100644 --- a/spec/controllers/administrateurs/procedures_controller_spec.rb +++ b/spec/controllers/administrateurs/procedures_controller_spec.rb @@ -7,6 +7,7 @@ describe Administrateurs::ProceduresController, type: :controller do let(:description) { 'Description de test' } let(:organisation) { 'Organisation de test' } let(:direction) { 'Direction de test' } + let(:ministere) { create(:zone) } let(:cadre_juridique) { 'cadre juridique' } let(:duree_conservation_dossiers_dans_ds) { 3 } let(:monavis_embed) { nil } @@ -30,6 +31,7 @@ describe Administrateurs::ProceduresController, type: :controller do description: description, organisation: organisation, direction: direction, + ministere: ministere, cadre_juridique: cadre_juridique, duree_conservation_dossiers_dans_ds: duree_conservation_dossiers_dans_ds, monavis_embed: monavis_embed, diff --git a/spec/factories/zone.rb b/spec/factories/zone.rb new file mode 100644 index 000000000..63fb8b925 --- /dev/null +++ b/spec/factories/zone.rb @@ -0,0 +1,6 @@ +FactoryBot.define do + factory :zone do + sequence(:acronym) { |n| "MA#{n}" } + sequence(:label) { |n| "Ministère de l'Education Populaire #{n}" } + end +end