This commit is contained in:
Ross
2024-11-04 11:41:38 +00:00
parent cee4009eb8
commit 155c036f0c
3 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -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"],
}
+1 -1
View File
@@ -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")
+2 -2
View File
@@ -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