Merge branch 'main' into sbl-proximity-search

Ash-Crow · Ash-Crow · commit 19706b0cdfa5 · 2026-01-14T15:45:07.000+01:00
diff --git a/src/backend/core/api/viewsets.py b/src/backend/core/api/viewsets.py
@@ -2295,7 +2295,8 @@ def get_queryset(self):
                 )
                 # Abilities are computed based on logged-in user's role and
                 # the user role on each document access
-                .annotate(user_roles=db.Subquery(user_roles_query)).distinct()
+                .annotate(user_roles=db.Subquery(user_roles_query))
+                .distinct()
             )
         return queryset
 

Original file line number	Diff line number	Diff line change
`@@ -2295,7 +2295,8 @@ def get_queryset(self):`
`2295`	`2295`	`)`
`2296`	`2296`	`# Abilities are computed based on logged-in user's role and`
`2297`	`2297`	`# the user role on each document access`
`2298`		`- .annotate(user_roles=db.Subquery(user_roles_query)).distinct()`
	`2298`	`+ .annotate(user_roles=db.Subquery(user_roles_query))`
	`2299`	`+ .distinct()`
`2299`	`2300`	`)`
`2300`	`2301`	`return queryset`
`2301`	`2302`