Commit b7a346b831b6b2d6883a13715a075de593ea1db7

Authored by Zambom
1 parent d3967caa

Adding search [Issue #23]

Showing 2 changed files with 13 additions and 2 deletions   Show diff stats
users/templates/list_users.html
@@ -61,6 +61,10 @@ @@ -61,6 +61,10 @@
61 {% endfor %} 61 {% endfor %}
62 {% pagination request paginator page_obj %} 62 {% pagination request paginator page_obj %}
63 {% else %} 63 {% else %}
64 - 64 + <div class="row">
  65 + <div class="col-md-12 col-sm-12 col-xs-12">
  66 + <p>{% trans 'No users found' %}</p>
  67 + </div>
  68 + </div>
65 {% endif %} 69 {% endif %}
66 {% endblock %} 70 {% endblock %}
users/views.py
1 from django.shortcuts import get_object_or_404 1 from django.shortcuts import get_object_or_404
  2 +from django.db.models import Q
2 from django.views import generic 3 from django.views import generic
3 from django.contrib import messages 4 from django.contrib import messages
4 from rolepermissions.mixins import HasRoleMixin 5 from rolepermissions.mixins import HasRoleMixin
@@ -19,7 +20,13 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView): @@ -19,7 +20,13 @@ class UsersListView(HasRoleMixin, LoginRequiredMixin, generic.ListView):
19 paginate_by = 10 20 paginate_by = 10
20 21
21 def get_queryset(self): 22 def get_queryset(self):
22 - users = User.objects.exclude(username = self.request.user.username) 23 + search = self.request.GET.get('search', None)
  24 +
  25 + if search is None:
  26 + users = User.objects.exclude(username = self.request.user.username)
  27 + else:
  28 + users = User.objects.filter(Q(username = search) | Q(name__icontains = search))
  29 +
23 return users 30 return users
24 31
25 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView): 32 class Create(HasRoleMixin, LoginRequiredMixin, generic.edit.CreateView):