diff --git a/CHANGELOG.md b/CHANGELOG.md index 691a1b945..58d979805 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ and this project adheres to * [activity]: perform client-side validation & show/hide fields in the "new location" modal * [tasks]: different layout for task list / my tasks, and fix link to tasks in alert or in warning * [admin]: links to activity admin section added again. +* [socialWorkAction]: display of social issue and parent issues + banner context added. ## Test releases diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue index b6333b426..fe7838c4d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue @@ -9,7 +9,7 @@

{{ $t('pick_social_issue_linked_with_action') }}

- {{ si.title.fr }} + {{ si.text }}
@@ -222,3 +222,16 @@ export default { } + + \ No newline at end of file diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig index b1d4682d8..b09f91cfd 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/create.html.twig @@ -18,6 +18,7 @@ window.accompanyingCourse = {{ json|json_encode|raw }}; + {{ parent() }} {{ encore_entry_script_tags('vue_accourse_work_create') }} {% endblock %}