diff --git a/generic/filters.py b/generic/filters.py index e2910fe4..4783ed4b 100644 --- a/generic/filters.py +++ b/generic/filters.py @@ -43,14 +43,14 @@ class UserUserFilter(django_filters.FilterSet): model = User # fields = ("cid", "active", "internal_candidate", "group") fields = { - "first_name": ["contains"], - "last_name": ["contains"], + "first_name": ["icontains"], + "last_name": ["icontains"], #"active": ["exact"], "user_groups": ["exact"], - "user_groups__name": ["contains"], + "user_groups__name": ["icontains"], #"userprofile__grade": ["exact"], #"userprofile__supervisor": ["exact"], - "email": ["contains"], + "email": ["icontains"], "is_active": ["exact"], "groups": ["exact"], } diff --git a/rad/views.py b/rad/views.py index c3fc8c4e..3cc0050a 100644 --- a/rad/views.py +++ b/rad/views.py @@ -737,7 +737,7 @@ def accounts_bulk_create_check(request): errors.append("No email provided") if User.objects.filter(username=user["email"]).exists(): - info.append("User already exists") + errors.append("User already exists") if not UserGrades.objects.filter(name=user["grade"]): errors.append("Invalid grade") diff --git a/templates/accounts_bulk_create.html b/templates/accounts_bulk_create.html index d5ec52e2..6fb4e040 100644 --- a/templates/accounts_bulk_create.html +++ b/templates/accounts_bulk_create.html @@ -132,7 +132,7 @@ console.log("Existing users", data) }) - $("#users-list").append(`${users.length} users to create.`) + $("#users-list").append(`${users.length} users to create/update.`) // Make sure the new hyperscript works _hyperscript.processNode($("#users-list")[0]); @@ -168,7 +168,7 @@ end else - put "no errors" into #alert + put "No errors" into #alert end then show #alert