bugfix for Django 5: QuerySet in FilteredRelation
authorRadek Czajka <radekczajka@wolnelektury.pl>
Tue, 17 Nov 2026 10:37:43 +0000 (11:37 +0100)
committerRadek Czajka <radekczajka@wolnelektury.pl>
Tue, 17 Nov 2026 10:37:43 +0000 (11:37 +0100)
src/catalogue/views.py

index 8d32e64..b8f42b1 100644 (file)
@@ -73,7 +73,7 @@ def differentiate_tags(request, tags, ambiguous_slugs):
     )
 
 
     )
 
 
-from django.db.models import FilteredRelation, Q
+from django.db.models import Q
 from django.views.decorators.cache import cache_control
 from django.views.decorators.vary import vary_on_headers
 from django.utils.decorators import method_decorator
 from django.views.decorators.cache import cache_control
 from django.views.decorators.vary import vary_on_headers
 from django.utils.decorators import method_decorator
@@ -187,10 +187,8 @@ class BookList(ObjectListView):
                     Q(text__icontains=term)
                 ).distinct()
             else:
                     Q(text__icontains=term)
                 ).distinct()
             else:
-                qs = qs.annotate(
-                    meta=FilteredRelation('tag_relations', condition=Q(tag_relations__in=meta_rels))
-                )
-                qs = qs.filter(Q(title__icontains=term) | Q(meta__tag__name_pl__icontains=term)).distinct()
+                rels = meta_rels.filter(tag__name_pl__icontains=term)
+                qs = qs.filter(Q(title__icontains=term) | Q(tag_relations__in=rels)).distinct()
         return qs
 
 
         return qs