From 9c5f384a9b347cfc2928f8c1e8f23c63665fb94c Mon Sep 17 00:00:00 2001 From: ailsoncgt Date: Fri, 21 Oct 2016 07:36:07 -0300 Subject: [PATCH] Bug manage users #184 --- users/templates/list_users.html | 10 ++++++---- users/views.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/users/templates/list_users.html b/users/templates/list_users.html index 382c733..c66ae6a 100644 --- a/users/templates/list_users.html +++ b/users/templates/list_users.html @@ -37,11 +37,13 @@ {% endif %}
-
+
-
- +
+
@@ -68,7 +70,7 @@

{% trans 'Contact' %}: {{ acc.phone }}

{% trans 'Edit' %} - {% trans 'Delete' %} + {% trans 'Delete' %}
diff --git a/users/views.py b/users/views.py index 309320b..b1b914d 100644 --- a/users/views.py +++ b/users/views.py @@ -26,7 +26,7 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView): if search is None: users = User.objects.exclude(username = self.request.user.username) else: - users = User.objects.filter(Q(username = search) | Q(name__icontains = search)) + users = User.objects.filter(Q(username = search) | Q(name = search) | Q(name__icontains = search) | Q(username__icontains = search)).exclude( username = self.request.user.username) return users -- libgit2 0.21.2