From db85a925446ab8082ead1e84d13d2fcf57603e83 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Fri, 13 Nov 2026 11:37:36 +0100 Subject: [PATCH 1/3] Up forms builder --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index cbcc31b17..92fb217dc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -23,7 +23,7 @@ django-admin-ordering==0.22 django-countries==9.1.0 -django-forms-builder @ git+https://github.com/rczajka/django-forms-builder@6533f9442f004d44ed362202b6bdab82b73dd5e9 +django-forms-builder @ git+https://github.com/rczajka/django-forms-builder@8364d3d1d460e015b045705cfbc87019e8d8a620 oauthlib==4.0.1 -- 2.20.1 From 5707b617718c2a5c9bc97e90aff2d38a4717528d Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 17 Nov 2026 11:37:43 +0100 Subject: [PATCH 2/3] bugfix for Django 5: QuerySet in FilteredRelation --- src/catalogue/views.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 -- 2.20.1 From 1aa23677658744856f96a31492487683dcd80ca5 Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Tue, 17 Nov 2026 12:16:39 +0100 Subject: [PATCH 3/3] Paypal fix --- src/paypal/rest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/paypal/rest.py b/src/paypal/rest.py index a5e7ebeee..cf80b46e1 100644 --- a/src/paypal/rest.py +++ b/src/paypal/rest.py @@ -1,12 +1,12 @@ # This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Wolne Lektury. See NOTICE for more information. # -from datetime import date, datetime, timedelta +from datetime import date, datetime, timedelta, timezone from decimal import Decimal import paypalrestsdk from django.contrib.sites.models import Site from django.urls import reverse -from django.utils import timezone +from django.utils.timezone import now from django.conf import settings from .models import BillingPlan, BillingAgreement @@ -69,7 +69,7 @@ def create_agreement(amount, key, app=False): plan_id = create_plan(amount) else: plan_id = plan.plan_id - start = (timezone.now() + timedelta(0, 3600*24)).astimezone(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ') + start = (now() + timedelta(0, 3600*24)).astimezone(timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ') billing_agreement = paypalrestsdk.BillingAgreement({ "name": "Subskrypcja klubu WL", "description": "Stałe wsparcie Wolnych Lektur kwotą %s złotych" % amount, -- 2.20.1