From f91cc05d953f8a738b3034f72569ec070338d3ba Mon Sep 17 00:00:00 2001 From: Damien Le Thiec Date: Tue, 31 Jan 2023 16:24:32 +0100 Subject: [PATCH] Small fix link to prefill type de champ --- app/controllers/api/public/v1/dossiers_controller.rb | 1 - app/controllers/prefill_type_de_champs_controller.rb | 2 +- app/models/prefill_params.rb | 3 --- app/models/types_de_champ/prefill_repetition_type_de_champ.rb | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/public/v1/dossiers_controller.rb b/app/controllers/api/public/v1/dossiers_controller.rb index 051bc9aac..2e770d6ce 100644 --- a/app/controllers/api/public/v1/dossiers_controller.rb +++ b/app/controllers/api/public/v1/dossiers_controller.rb @@ -2,7 +2,6 @@ class API::Public::V1::DossiersController < API::Public::V1::BaseController before_action :retrieve_procedure def create - byebug dossier = Dossier.new( revision: @procedure.active_revision, groupe_instructeur: @procedure.defaut_groupe_instructeur_for_new_dossier, diff --git a/app/controllers/prefill_type_de_champs_controller.rb b/app/controllers/prefill_type_de_champs_controller.rb index 22f5f1a54..82817f324 100644 --- a/app/controllers/prefill_type_de_champs_controller.rb +++ b/app/controllers/prefill_type_de_champs_controller.rb @@ -12,6 +12,6 @@ class PrefillTypeDeChampsController < ApplicationController end def set_prefill_type_de_champ - @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ_public.fillable.find(params[:id])) + @type_de_champ = TypesDeChamp::PrefillTypeDeChamp.build(@procedure.active_revision.types_de_champ.fillable.find(params[:id])) end end diff --git a/app/models/prefill_params.rb b/app/models/prefill_params.rb index 177aef1b4..6f16c1e2e 100644 --- a/app/models/prefill_params.rb +++ b/app/models/prefill_params.rb @@ -11,9 +11,6 @@ class PrefillParams private def build_prefill_values - byebug - # nop : "[{\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}, {\"txt\":\"Texte court\", \"nb\":\"3.14\", \"Test dropdown\":\"Premier choix\", \"régio\":\"53\"}]" - # {"champ_Q2hhbXAtNDI="=>["{\"txt\":\"abc\", \"nb\":\"1,12\"}", "{\"txt\":\"def\", \"nb\":\"2,12\"}"]} value_by_stable_id = @params .map { |prefixed_typed_id, value| [stable_id_from_typed_id(prefixed_typed_id), value] } .filter { |stable_id, value| stable_id.present? && value.present? } diff --git a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb index 01112ec58..cdf435f6e 100644 --- a/app/models/types_de_champ/prefill_repetition_type_de_champ.rb +++ b/app/models/types_de_champ/prefill_repetition_type_de_champ.rb @@ -4,7 +4,7 @@ class TypesDeChamp::PrefillRepetitionTypeDeChamp < TypesDeChamp::PrefillTypeDeCh def possible_values prefillable_subchamps.map do |prefill_type_de_champ| if prefill_type_de_champ.too_many_possible_values? - link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", self) + link = link_to "Voir toutes les valeurs possibles", Rails.application.routes.url_helpers.prefill_type_de_champ_path("piece-jointe", prefill_type_de_champ) "#{prefill_type_de_champ.libelle}: #{link}" else "#{prefill_type_de_champ.libelle}: #{prefill_type_de_champ.possible_values_sentence}"