From 11d6b76cc3a94b09cb32a3b1d8cc6a15bab30b9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Tue, 11 Jun 2024 23:19:19 +0200
Subject: [PATCH] fix article filtering
---
shared/models/main.py | 35 +++--------------------------------
1 file changed, 3 insertions(+), 32 deletions(-)
diff --git a/shared/models/main.py b/shared/models/main.py
index 2d1a58ff..8e78600b 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -1107,45 +1107,16 @@ class MainHomePageMixin(
context["article_data_list"] = self.materialize_shared_articles_query(
self.append_all_shared_articles_query(
- self.article_page_model.objects.live().all()
+ self.article_page_model.objects.live().child_of(self.articles_page).all()
).order_by("-union_timestamp")[:3]
)
return context
- def get_region_response(self, request):
- context = {}
- if request.GET.get("region", None) == "VSK":
- sorted_article_qs = self.article_page_model.objects.filter(
- region__isnull=False
- ).order_by("-timestamp")
-
- context = {"article_data_list": sorted_article_qs[:3]}
- else:
- sorted_article_qs = self.article_page_model.objects.filter(
- region=request.GET.get("region", None)
- )[:3]
-
- context = {"article_data_list": sorted_article_qs[:3]}
-
- data = {
- "html": render(
- request, "styleguide2/includes/small_article_preview.html", context
- ).content.decode("utf-8")
- }
-
- return JsonResponse(data=data, safe=False)
-
- def serve(self, request, *args, **kwargs):
- if request.META.get("HTTP_X_REQUESTED_WITH") == "XMLHttpRequest":
- if "region" in request.GET:
- return self.get_region_response(request)
-
- return super().serve(request, *args, **kwargs)
-
@cached_property
def newsletter_subscribe_url(self):
newsletter_subscribe = self.reverse_subpage("newsletter_subscribe")
+
return (
self.url + newsletter_subscribe
if self.url is not None
@@ -1303,7 +1274,7 @@ class MainArticlesPageMixin(
def get_base_shared_articles_query(self, filter: models.Q):
return self.materialize_shared_articles_query(
self.append_all_shared_articles_query(
- self.root_page.article_page_model.objects.filter(filter).live().all()
+ self.root_page.article_page_model.objects.filter(filter).live().child_of(self).all()
).order_by("-union_timestamp")
)
--
GitLab