Skip to content
Snippets Groups Projects
Commit 11d6b76c authored by Alexa Valentová's avatar Alexa Valentová
Browse files

fix article filtering

parent 01775e63
Branches
No related tags found
2 merge requests!997Release,!996Fix articles filtering
......@@ -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")
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment