From 4d1a553474e512ed0b9b9cff3a0dbced1ed0f177 Mon Sep 17 00:00:00 2001 From: nobohan Date: Fri, 28 Jan 2022 11:40:08 +0100 Subject: [PATCH] =?UTF-8?q?show=20activity=20attendee=20(pr=C3=A9sence)=20?= =?UTF-8?q?in=20the=20activity=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/views/Activity/_list_item.html.twig | 11 +++++++++++ .../Resources/views/Activity/show.html.twig | 6 +----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig index 6b2e33dfb..fadf7ff14 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig @@ -41,6 +41,17 @@ {% endif %} + {% if activity.attendee and t.attendeeVisible %} +
+

{{ 'Attendee'|trans }}

+
+

+ {{ activity.attendee.name|localize_translatable_string }} +

+
+
+ {% endif %} + {% if activity.sentReceived is not empty and t.sentReceivedVisible %}

{{ 'Sent received'|trans }}

diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig index 546ba99ce..a5e3bd1fd 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig @@ -165,11 +165,7 @@
{{ 'Attendee'|trans }}
{% if entity.attendee is not null %} - {% if entity.attendee %} - {{ 'present'|trans|capitalize }} - {% else %} - {{ 'not present'|trans|capitalize }} - {% endif %} + {{ entity.attendee.name|localize_translatable_string }} {% else %} {{ 'None'|trans|capitalize }} {% endif %}