Merge branch 'master' into 'feature/add-requestor-in-search-results'

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
2021-10-03 19:16:17 +00:00
58 changed files with 868 additions and 439 deletions

View File

@@ -17,11 +17,19 @@
{%- endif -%}
</div>
<div class="text-md-end">
{% if person|chill_resolve_center is not null%}
{% if person|chill_resolve_center is not null %}
<span class="open_sansbold">
{{ 'Center'|trans|upper}} :
</span>
{{ person|chill_resolve_center.name|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 %}
{%- endif -%}
</div>
</div>