From 98b9f5d2d76155393608b5928484910f032350d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Tue, 30 Jun 2020 17:45:03 +0200 Subject: [PATCH] [Accompanying period] fix closing motive label --- CHANGELOG.md | 1 + Resources/views/AccompanyingPeriod/list.html.twig | 13 +++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9376be5f8..76a8da430 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -110,3 +110,4 @@ Master branch ============= - [Accompanying period list] Fix period label in list +- [Accompanying period list] Fix label of closing motive diff --git a/Resources/views/AccompanyingPeriod/list.html.twig b/Resources/views/AccompanyingPeriod/list.html.twig index 968285864..ab84aec11 100644 --- a/Resources/views/AccompanyingPeriod/list.html.twig +++ b/Resources/views/AccompanyingPeriod/list.html.twig @@ -28,6 +28,14 @@ '%opening_date%': accompanying_period.openingDate|localizeddate('long', 'none'), '%closing_date%': accompanying_period.closingDate|localizeddate('long', 'none')} ) }} + + {% if accompanying_period.isOpen == false %} +
+
{{ 'Closing motive'|trans }} :
+
{{ accompanying_period.closingMotive|chill_entity_render_box }}
+
+ {% endif %} + {% endif %} {% if chill_accompanying_periods.fields.user == 'visible' %} @@ -40,10 +48,7 @@ {% endif %} - {% if accompanying_period.isOpen == false %} -
{{ accompanying_period.closingMotive|chill_entity_render_box }}
-
- {% endif %} + {{ accompanying_period.remark|chill_print_or_message('No remark', 'blockquote') }}