diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig index 8a9cc4e5d..f60b7dc9e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig @@ -16,6 +16,10 @@ 'replace' Twig\Markup, 'after' Twig\Markup ] + * customArea [ + 'beforeLabel' Twig\Markup, + 'afterLabel' Twig\Markup, + ] #} {% macro raw(person, options) %} @@ -37,11 +41,22 @@
{%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%} - {{ _self.raw(person, options) }} - - {%- else -%} - {{ _self.raw(person, options) }} {%- endif -%} + + {% if options['customArea']['beforeLabel'] is defined %} + {{ options['customArea']['beforeLabel'] }} + {% endif %} + + {{ _self.raw(person, options) }} + + {% if options['customArea']['afterLabel'] is defined %} + {{ options['customArea']['afterLabel'] }} + {% endif %} + + {%- if options['addLink'] and is_granted('CHILL_PERSON_SEE', person) -%} + + {%- endif -%} + {%- if options['addEntity'] -%} {{ 'Person'|trans }} {%- endif -%} diff --git a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php index 55890c4b0..fc112a1e7 100644 --- a/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php +++ b/src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php @@ -62,6 +62,7 @@ class PersonRender extends AbstractChillEntityRender 'address_multiline' => $options['address_multiline'] ?? false, 'hLevel' => $options['hLevel'] ?? 3, 'customButtons' => $options['customButtons'] ?? [], + 'customArea' => $options['customArea'] ?? [], ]; return diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig index 689c98ecb..7768d2913 100644 --- a/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig +++ b/src/Bundle/ChillThirdPartyBundle/Resources/views/Entity/thirdparty.html.twig @@ -13,6 +13,10 @@ 'replace' Twig\Markup, 'after' Twig\Markup ] + * customArea [ + 'beforeLabel' Twig\Markup, + 'afterLabel' Twig\Markup, + ] #} {% macro raw(thirdparty, options) %} @@ -23,13 +27,25 @@
+ {%- if options['addLink'] and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%} - {{ _self.raw(thirdparty, options) }} - - {%- else -%} - {{ _self.raw(thirdparty, options) }} {%- endif -%} + + {% if options['customArea']['beforeLabel'] is defined %} + {{ options['customArea']['beforeLabel'] }} + {% endif %} + + {{ _self.raw(thirdparty, options) }} + + {% if options['customArea']['afterLabel'] is defined %} + {{ options['customArea']['afterLabel'] }} + {% endif %} + + {%- if options['addLink'] and is_granted('CHILL_3PARTY_3PARTY_SHOW', thirdparty) -%} + + {%- endif -%} + {%- if options['addEntity'] -%} {{ 'Third party'|trans }} {%- endif -%} diff --git a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php index 07f6e1668..80450f7bb 100644 --- a/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php +++ b/src/Bundle/ChillThirdPartyBundle/Templating/Entity/ThirdPartyRender.php @@ -54,6 +54,7 @@ class ThirdPartyRender extends AbstractChillEntityRender 'addInfo' => $options['addInfo'] ?? false, 'hLevel' => $options['hLevel'] ?? 3, 'customButtons' => $options['customButtons'] ?? [], + 'customArea' => $options['customArea'] ?? [], ]; return