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

go/go/templates/banned.html

@@ -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 />

go/go/views.py

@@ -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', {