From 3aa4c49d006c6b3507cb9419ca6e283fe6340e88 Mon Sep 17 00:00:00 2001 From: LenaertsJ Date: Fri, 5 Dec 2025 11:47:33 +0000 Subject: [PATCH] =?UTF-8?q?Resolve=20"Lors=20de=20l'annulation=20d'un=20re?= =?UTF-8?q?ndez-vous,=20obtenir=20des=20d=C3=A9tails=20sur=20le=20rendez-v?= =?UTF-8?q?ous=20annul=C3=A9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changes/unreleased/UX-20251124-164723.yaml | 6 ++++++ .../Resources/views/Calendar/_list.html.twig | 3 ++- .../Calendar/cancelCalendarByAccompanyingCourse.html.twig | 4 ++++ .../views/Calendar/cancelCalendarByPerson.html.twig | 4 ++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .changes/unreleased/UX-20251124-164723.yaml diff --git a/.changes/unreleased/UX-20251124-164723.yaml b/.changes/unreleased/UX-20251124-164723.yaml new file mode 100644 index 000000000..298cbc5ee --- /dev/null +++ b/.changes/unreleased/UX-20251124-164723.yaml @@ -0,0 +1,6 @@ +kind: UX +body: Display calendar item info on cancel page +time: 2025-11-24T16:47:23.020302054+01:00 +custom: + Issue: "460" + SchemaChange: No schema change diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig index c827ca4f4..88ce1b6e5 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig @@ -162,6 +162,7 @@ {% endif %}
+ {% if show_record_actions is not defined or show_record_actions %} - + {% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig index 2f6759725..a0d10273b 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig @@ -6,6 +6,10 @@ {% block content %} +
+ {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course', show_record_actions: false}) }} +
+ {{ form_start(form) }} {{ form_row(form.cancelReason) }} diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig index 76196b23e..4ef1c2e65 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig @@ -6,6 +6,10 @@ {% block content %} +
+ {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'person', show_record_actions: false}) }} +
+ {{ form_start(form) }} {{ form_row(form.cancelReason) }}