diff --git a/CHANGELOG.md b/CHANGELOG.md index bc10c555c..77986b1fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,6 @@ Branch master ============= - fix bug in filter task form: allow to show the list of users, which was hidden when the user had access to multiple centers; +- add assignee in task list; +- fix some translation; diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml index bea9f527e..04d7d2dbe 100644 --- a/Resources/translations/messages.fr.yml +++ b/Resources/translations/messages.fr.yml @@ -59,7 +59,7 @@ Any user: Tous les utilisateurs Unassigned: Non assigné Associated person: Personne associée Default task: Tâche par défaut - +Not assigned: Aucun utilisateur assigné # transitions - default task definition 'new': 'nouvelle' diff --git a/Resources/views/SingleTask/_list.html.twig b/Resources/views/SingleTask/_list.html.twig index 0f465e17b..341fbcc8a 100644 --- a/Resources/views/SingleTask/_list.html.twig +++ b/Resources/views/SingleTask/_list.html.twig @@ -26,6 +26,14 @@ {% for place in workflow_marked_places(task) %} {{ place|trans }} {% endfor %} + + {% if task.assignee is not null %} +
+
{{ 'Assignee'|trans }}
+
{{ task.assignee.username }}
+
+ {% endif %} + {% if task.startDate is null and task.warningDate is null and task.endDate is null %}