From: Radek Czajka Date: Tue, 17 Nov 2026 10:37:43 +0000 (+0100) Subject: bugfix for Django 5: QuerySet in FilteredRelation X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/5707b617718c2a5c9bc97e90aff2d38a4717528d?ds=inline bugfix for Django 5: QuerySet in FilteredRelation --- diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 8d32e64ee..b8f42b1e6 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -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 @@ -187,10 +187,8 @@ class BookList(ObjectListView): 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