mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-10-04 20:39:40 +00:00
Merge branch 'master' into migrate_to_sf72
# Conflicts: # src/Bundle/ChillEventBundle/Controller/EventController.php # src/Bundle/ChillEventBundle/Controller/ParticipationController.php # src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php # src/Bundle/ChillEventBundle/Entity/Event.php # src/Bundle/ChillEventBundle/Form/EventType.php # src/Bundle/ChillEventBundle/Menu/AdminMenuBuilder.php # src/Bundle/ChillEventBundle/config/services.yaml # src/Bundle/ChillEventBundle/config/services/controller.yaml # src/Bundle/ChillMainBundle/Resources/views/Menu/user.html.twig # src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php # src/Bundle/ChillPersonBundle/Controller/PersonController.php # src/Bundle/ChillPersonBundle/Form/PersonType.php
This commit is contained in:
@@ -110,6 +110,24 @@ class Configuration implements ConfigurationInterface
|
||||
->end()
|
||||
->end() // children for 'person_fields', parent = array 'person_fields'
|
||||
->end() // person_fields, parent = children of root
|
||||
->arrayNode('person_render')
|
||||
->addDefaultsIfNotSet()
|
||||
->children()
|
||||
->scalarNode('id_content_text')
|
||||
->defaultValue('n°[[ person_id ]]')
|
||||
->info(
|
||||
<<<'EOF'
|
||||
The way we display the person's id. Variables availables: "[[ person_id ]]", or, for person's
|
||||
identifier: "[[ identifier_xx ]]" where xx is the identifier's definition's id.
|
||||
|
||||
There are also conditions available: "[[ if:identifier_yy ]] [[ identifier_yy ]] [[ endif:identifier_yy ]]"
|
||||
|
||||
Take care of keeping exactly one space between "[[" and the placeholder's content, and exactly one space before "]]"
|
||||
EOF
|
||||
)
|
||||
->end()
|
||||
->end() // end of person_render's children
|
||||
->end() // end of person_render
|
||||
->arrayNode('household_fields')
|
||||
->canBeDisabled()
|
||||
->children()
|
||||
|
Reference in New Issue
Block a user