Skip to content
Merged

fix #12

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion presente/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def get_queryset(self):
qs = Attendance.objects.filter(activity=activity).select_related("user")

if connection.vendor == "postgresql":
from django.contrib.postgres.fields import Collate
from django.db.models.functions import Collate

qs = qs.annotate(user_name_collated=Collate("user__full_name", "pt_BR"))
else:
Expand Down
2 changes: 1 addition & 1 deletion users/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def get_queryset(self):
queryset = queryset.prefetch_related("socialaccount_set")

if connection.vendor == "postgresql":
from django.contrib.postgres.fields import Collate
from django.db.models.functions import Collate

queryset = queryset.annotate(
full_name_collated=Collate("full_name", "pt_BR")
Expand Down