diff --git a/CHANGELOG.md b/CHANGELOG.md index 8729ef308..0efb6a3be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ and this project adheres to ### Test release 2021-11-08 +* [person]: Display the name of a user when searching after a User (TMS) * [person]: Add civility to the person * [person]: Various improvements on the edit person form * [person]: Set available_languages and available_countries as parameters for use in the edit person form diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig index 89a790588..9e36f14f6 100644 --- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig +++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig @@ -40,7 +40,6 @@ }, { 'title': 'Users concerned'|trans, 'items': entity.users, - 'path' : 'admin_user_show', 'key' : 'id' }, ] %} @@ -58,6 +57,7 @@ @@ -85,6 +93,7 @@ @@ -114,12 +129,19 @@ {% for item in bloc.items %} + {% if bloc.path is defined %} {{ item|chill_entity_render_box({ 'render': 'raw', 'addAltNames': false }) }} + {% else %} + {{ item|chill_entity_render_box({ + 'render': 'raw', + 'addAltNames': false + }) }} + {% endif %} {% endfor %} diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue index 931830fd3..e3b4901d7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue @@ -20,18 +20,25 @@ v-bind:item="item"> + + + + +