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

Use lambda instead of send for etablissement tag

Browse source
This commit is contained in:
Frederic Merizen 2018-01-17 16:54:30 +01:00
parent 6a95cc6498
commit 9b4ce1517c
2 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/concerns/tags_substitution_concern.rb
View file

@ -97,14 +97,11 @@ module TagsSubstitutionConcern
description: '',
target: :raison_sociale,
available_for_states: Dossier::SOUMIS
}
]
ETABLISSEMENT_TAGS = [
},
{
libelle: 'adresse',
description: '',
target: :inline_adresse,
lambda: -> (e) { e&.etablissement&.inline_adresse },
available_for_states: Dossier::SOUMIS
}
]
@ -113,7 +110,7 @@ module TagsSubstitutionConcern
if procedure.for_individual?
identity_tags = INDIVIDUAL_TAGS
else
identity_tags = ENTREPRISE_TAGS + ETABLISSEMENT_TAGS
identity_tags = ENTREPRISE_TAGS
end
filter_tags(identity_tags + dossier_tags + champ_public_tags + champ_private_tags)
@ -185,8 +182,7 @@ module TagsSubstitutionConcern
tags_and_datas = [
[dossier_tags, dossier],
[INDIVIDUAL_TAGS, dossier.individual],
[ENTREPRISE_TAGS, dossier.entreprise],
[ETABLISSEMENT_TAGS, dossier.entreprise&.etablissement]
[ENTREPRISE_TAGS, dossier.entreprise]
]
tags_and_datas