Adding search [Issue #23]

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