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

[#3356] Improve formatting for menus that only have a primary value

Browse source
This commit is contained in:
Frederic Merizen 2019-02-05 16:41:21 +01:00 committed by simon lehericey
parent a3d7c8de55
commit a255e61556
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/champs/linked_drop_down_list_champ.rb
View file

@ -30,7 +30,7 @@ class Champs::LinkedDropDownListChamp < Champ
end end
def to_s def to_s
value.present? ? [primary_value, secondary_value].compact.join(' / ') : "" value.present? ? [primary_value, secondary_value].select(&:present?).join(' / ') : ""
end end
def for_export def for_export

2
spec/models/concern/tags_substitution_concern_spec.rb
View file

@ -129,7 +129,7 @@ describe TagsSubstitutionConcern, type: :model do
c.primary_value = 'primo' c.primary_value = 'primo'
c.save c.save
end end
it { is_expected.to eq('tout : primo / , primaire : primo, secondaire : ') } it { is_expected.to eq('tout : primo, primaire : primo, secondaire : ') }
end end
context 'and the champ has a primary and secondary value' do context 'and the champ has a primary and secondary value' do