From c368eacd87dce3ad0db77bed5121eea9ed24b73e Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sun, 27 Oct 2019 13:56:45 +0100 Subject: [PATCH] fixed renamed filter name, added that disabled users cannot be filtered (#1193) --- templates/user/actions.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/user/actions.html.twig b/templates/user/actions.html.twig index a47ec479..dc3fbc5d 100644 --- a/templates/user/actions.html.twig +++ b/templates/user/actions.html.twig @@ -54,8 +54,8 @@ {% if is_granted('preferences', user) %} {% set actions = actions|merge({'settings': {'url': path('user_profile_preferences', {'username' : user.username})}}) %} {% endif %} - {% if is_granted('view_other_timesheet') %} - {% set actions = actions|merge({'timesheet': path('admin_timesheet', {'user' : user.id})}) %} + {% if is_granted('view_other_timesheet') and user.enabled %} + {% set actions = actions|merge({'timesheet': path('admin_timesheet', {'users': [user.id]})}) %} {% endif %} {% if view == 'index' and is_granted('delete', user) %} {% set actions = actions|merge({'trash': {'url': path('admin_user_delete', {'id': user.id}), 'class': 'modal-ajax-form'}}) %}