From 8423c6c99cc65aa600e036c6dfe389e9a7ae1464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 22 Nov 2021 10:55:38 +0100 Subject: [PATCH] fix banners: resolve_center is always an iterable --- .../Resources/views/Entity/person.html.twig | 8 ++------ .../Resources/views/Person/banner_custom.html.twig | 12 ++++-------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig index c28504042..adee8bdc3 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig @@ -148,12 +148,8 @@ {% endif %} {% endif %} - {% if options['addCenter'] and person|chill_resolve_center is not null %} - {% if person|chill_resolve_center is iterable %} - {% set centers = person|chill_resolve_center %} - {% else %} - {% set centers = [ person|chill_resolve_center ] %} - {% endif %} + {% if options['addCenter'] and person|chill_resolve_center|length > 0 %} + {% set centers = person|chill_resolve_center %}
  • {% for c in centers %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig index 378eda5c5..f819da692 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/banner_custom.html.twig @@ -17,18 +17,14 @@ {%- endif -%}
    - {% if person|chill_resolve_center is not null %} + {% if person|chill_resolve_center|length > 0 %} {{ 'Center'|trans|upper}} : - {% if person|chill_resolve_center is iterable %} - {% for c in person|chill_resolve_center %} - {{ c.name|upper }}{% if not loop.last %}, {% endif %} - {% endfor %} - {% else %} - {{ person|chill_resolve_center.name|upper }} - {% endif %} + {% for c in person|chill_resolve_center %} + {{ c.name|upper }}{% if not loop.last %}, {% endif %} + {% endfor %} {%- endif -%}