diff --git a/app/models/champs/linked_drop_down_list_champ.rb b/app/models/champs/linked_drop_down_list_champ.rb index db12156a0..86002db60 100644 --- a/app/models/champs/linked_drop_down_list_champ.rb +++ b/app/models/champs/linked_drop_down_list_champ.rb @@ -29,10 +29,6 @@ class Champs::LinkedDropDownListChamp < Champ :primary_value end - def for_display - string_value - end - def mandatory_and_blank? mandatory? && (primary_value.blank? || secondary_value.blank?) end diff --git a/app/views/shared/dossiers/_champs.html.haml b/app/views/shared/dossiers/_champs.html.haml index bab7a4e51..604e89e7c 100644 --- a/app/views/shared/dossiers/_champs.html.haml +++ b/app/views/shared/dossiers/_champs.html.haml @@ -19,7 +19,7 @@ - when TypeDeChamp.type_champs.fetch(:linked_drop_down_list) %th.libelle = "#{c.libelle} :" - %td= c.for_display + %td= c - when TypeDeChamp.type_champs.fetch(:dossier_link) %th.libelle = "#{c.libelle} :" diff --git a/spec/models/champs/linked_drop_down_list_champ_spec.rb b/spec/models/champs/linked_drop_down_list_champ_spec.rb index 70ec18108..64ec6d092 100644 --- a/spec/models/champs/linked_drop_down_list_champ_spec.rb +++ b/spec/models/champs/linked_drop_down_list_champ_spec.rb @@ -16,12 +16,12 @@ describe Champs::LinkedDropDownListChamp do it { expect(champ.value).to eq('["tata","tutu"]') } end - describe '#for_display' do + describe '#to_s' do let(:champ) { described_class.new(primary_value: primary_value, secondary_value: secondary_value) } let(:primary_value) { nil } let(:secondary_value) { nil } - subject { champ.for_display } + subject { champ.to_s } context 'with no value' do it { is_expected.to eq('') }