mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-12-05 18:03:57 +00:00
Merge branch '460-display-canceled-calendar-info' into 'master'
Resolve "Lors de l'annulation d'un rendez-vous, obtenir des détails sur le rendez-vous annulé" Closes #460 See merge request Chill-Projet/chill-bundles!929
This commit is contained in:
6
.changes/unreleased/UX-20251124-164723.yaml
Normal file
6
.changes/unreleased/UX-20251124-164723.yaml
Normal file
@@ -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
|
||||
@@ -162,6 +162,7 @@
|
||||
{% endif %}
|
||||
|
||||
<div class="item-row separator">
|
||||
{% if show_record_actions is not defined or show_record_actions %}
|
||||
<ul class="record_actions">
|
||||
{% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
|
||||
{% if templates|length == 0 %}
|
||||
@@ -245,7 +246,7 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="flex-table list-records context-accompanyingCourse">
|
||||
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course', show_record_actions: false}) }}
|
||||
</div>
|
||||
|
||||
{{ form_start(form) }}
|
||||
|
||||
{{ form_row(form.cancelReason) }}
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="flex-table list-records context-person">
|
||||
{{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'person', show_record_actions: false}) }}
|
||||
</div>
|
||||
|
||||
{{ form_start(form) }}
|
||||
|
||||
{{ form_row(form.cancelReason) }}
|
||||
|
||||
Reference in New Issue
Block a user