Commit 05b6cb0f authored by Zosman's avatar Zosman
Browse files

This commit fixes a bug where a user could be in both Waiting to Register and blocked user tables

parent 368a148c
Pipeline #474 passed with stage
in 7 minutes and 22 seconds
......@@ -25,7 +25,7 @@ SRCT Go • Account Blocked
<div class="col-md-12">
{% block name %}
<p>
You have been banned from go {{ request.user.registereduser.full_name }}.
You have been banned from Go: <strong>{{ request.user.registereduser.full_name }}</strong>.
</p>
{% endblock %}
<br />
......
......@@ -400,7 +400,7 @@ def useradmin(request):
toremove.user.delete()
return HttpResponseRedirect('useradmin')
need_approval = RegisteredUser.objects.filter(registered=True).filter(approved=False)
need_approval = RegisteredUser.objects.filter(registered=True).filter(approved=False).filter(blocked=False)
current_users = RegisteredUser.objects.filter(approved=True).filter(registered=True)
blocked_users = RegisteredUser.objects.filter(blocked=True)
return render(request, 'admin/useradmin.html', {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment