diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb index 5002e4cc2..973776036 100644 --- a/app/controllers/admin/procedures_controller.rb +++ b/app/controllers/admin/procedures_controller.rb @@ -66,7 +66,7 @@ class Admin::ProceduresController < AdminController @procedure = Procedure.new(procedure_params) if @procedure.valid? - @procedure.module_api_carto = ModuleAPICarto.new(create_module_api_carto_params) + @procedure.module_api_carto = ModuleAPICarto.new end @path = @procedure.path @@ -271,8 +271,4 @@ class Admin::ProceduresController < AdminController params.require(:procedure).permit(*editable_params, :duree_conservation_dossiers_dans_ds, :duree_conservation_dossiers_hors_ds, :for_individual, :individual_with_siret, :ask_birthday, module_api_carto_attributes: [:id, :use_api_carto, :quartiers_prioritaires, :cadastre]).merge(administrateur_id: current_administrateur.id) end end - - def create_module_api_carto_params - params.require(:procedure).require(:module_api_carto_attributes).permit(:id, :use_api_carto, :quartiers_prioritaires, :cadastre) - end end diff --git a/app/views/admin/procedures/_informations.html.haml b/app/views/admin/procedures/_informations.html.haml index 61fe6c136..751a0f5e5 100644 --- a/app/views/admin/procedures/_informations.html.haml +++ b/app/views/admin/procedures/_informations.html.haml @@ -119,30 +119,6 @@ Afficher le drapeau européen - if !@procedure.locked? - .row - .col-md-6 - %h4 Cartographie - - = f.fields_for :module_api_carto, @procedure.module_api_carto do |ff| - .checkbox - %label - = ff.check_box :use_api_carto, id: "procedure-module-api-carto-use-api-carto" - Utilisation de la cartographie - - %ul#modules-api-carto - %li - .checkbox - %label - = ff.check_box :quartiers_prioritaires - Quartiers prioritaires - %li - .checkbox - %label - = ff.check_box :cadastre - Cadastre - - .col-md-6 - .row .col-md-6 %h4 Particuliers diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb index bd717ab09..b755f0a6f 100644 --- a/spec/controllers/admin/procedures_controller_spec.rb +++ b/spec/controllers/admin/procedures_controller_spec.rb @@ -201,18 +201,6 @@ describe Admin::ProceduresController, type: :controller do it { expect(subject.duree_conservation_dossiers_hors_ds).to eq(duree_conservation_dossiers_hors_ds) } end - describe 'procedure module api carto attributs in database' do - let(:procedure) { Procedure.last } - let(:use_api_carto) { '1' } - let(:quartiers_prioritaires) { '1' } - - subject { ModuleAPICarto.last } - - it { expect(subject.procedure).to eq(procedure) } - it { expect(subject.use_api_carto).to be_truthy } - it { expect(subject.quartiers_prioritaires).to be_truthy } - end - it { is_expected.to redirect_to(admin_procedure_types_de_champ_path(procedure_id: Procedure.last.id)) } it { expect(flash[:notice]).to be_present }