Merge branch 'master' into search

# Conflicts: # RIGS/templates/RIGS/index.html
2026-01-21 07:22:14 +00:00 · 2020-02-29 11:47:35 +00:00
parent 3a7dc061bb 4a4d4a5cf3
commit 4f088fb426
19 changed files with 194 additions and 28 deletions
--- a/RIGS/views.py
+++ b/RIGS/views.py
@@ -41,7 +41,7 @@ def login(request, **kwargs):
    else:
        from django.contrib.auth.views import login

-        return login(request)
+        return login(request, authentication_form=forms.CheckApprovedForm)


 class SearchHelp(generic.TemplateView):