From 16b3be322a7286ebf23aef06d48bbb3bb0600f9e Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Fri, 10 Dec 2021 14:10:23 +0100 Subject: [PATCH] actions list: display badges as clickable onthefly modal --- .../listByAccompanyingCourse.html.twig | 9 +++++--- .../AccompanyingCourseWork/index.html.twig | 22 ++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig index 07aed8686..215b7bb55 100644 --- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig +++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig @@ -92,8 +92,11 @@ %}
- - {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {'context': accompanyingCourse, 'with_display': 'row', 'entity': calendar } %} + {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with { + 'context': accompanyingCourse, + 'with_display': 'row', + 'entity': calendar + } %}
{% if calendar.comment.comment is not empty %} @@ -123,4 +126,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig index 844b2d611..eb885d50a 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/index.html.twig @@ -65,11 +65,12 @@
{% for p in w.persons %} - - {{ p|chill_entity_render_box({ - 'render': 'raw', - 'addAltNames': false - }) }} + + {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with { + action: 'show', displayBadge: true, + targetEntity: { name: 'person', id: p.id }, + buttonText: p|chill_entity_render_string + } %} {% endfor %}
@@ -82,11 +83,12 @@

{{ 'Thirdparty handling'|trans }}

- - {{ w.handlingThierParty|chill_entity_render_box({ - 'render': 'raw', - 'addAltNames': false - }) }} + + {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with { + action: 'show', displayBadge: true, + targetEntity: { name: 'thirdparty', id: w.handlingThierParty.id }, + buttonText: w.handlingThierParty|chill_entity_render_string + } %}