From fc5c965c6b0d1078dc339cc4fb161150098bae97 Mon Sep 17 00:00:00 2001
From: sandeepsajan0 <sandeepsajan0@gmail.com>
Date: Wed, 13 Apr 2022 15:33:20 +0530
Subject: [PATCH] User count show total number of users not only the no of
users on page
---
hypha/apply/users/admin_views.py | 3 +++
hypha/apply/users/templates/wagtailusers/users/results.html | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hypha/apply/users/admin_views.py b/hypha/apply/users/admin_views.py
index 8d122e10d..b1e8d9c6e 100644
--- a/hypha/apply/users/admin_views.py
+++ b/hypha/apply/users/admin_views.py
@@ -104,12 +104,14 @@ def index(request):
else:
ordering = 'name'
+ user_count = users.count()
paginator = Paginator(users, per_page=20)
users = paginator.get_page(request.GET.get('p'))
if request.headers.get('x-requested-with') == 'XMLHttpRequest':
return render(request, "wagtailusers/users/results.html", {
'users': users,
+ 'user_count': user_count,
'is_searching': is_searching,
'query_string': q,
'filters': filters,
@@ -121,6 +123,7 @@ def index(request):
return render(request, "wagtailusers/users/index.html", {
'search_form': form,
'users': users,
+ 'user_count': user_count,
'is_searching': is_searching,
'ordering': ordering,
'query_string': q,
diff --git a/hypha/apply/users/templates/wagtailusers/users/results.html b/hypha/apply/users/templates/wagtailusers/users/results.html
index 5469443aa..745afe7c1 100644
--- a/hypha/apply/users/templates/wagtailusers/users/results.html
+++ b/hypha/apply/users/templates/wagtailusers/users/results.html
@@ -3,10 +3,10 @@
<div class="users-list__results">
{% if users %}
<h2 role="alert">
- {% blocktrans trimmed count counter=users|length %}
- There is {{ counter }} user
+ {% blocktrans trimmed count count=user_count %}
+ There is {{ user_count }} user
{% plural %}
- There are {{ counter }} users
+ There are {{ user_count }} users
{% endblocktrans %}
</h2>
--
GitLab