Skip to content
Snippets Groups Projects
Commit 685fb489 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

fix work timeline article listing

parent ad45c8a7
No related branches found
No related tags found
2 merge requests!728fix work timeline article listing,!727Fix work timeline article listing
Pipeline #11554 passed
...@@ -396,6 +396,7 @@ class MainArticlesPage( ...@@ -396,6 +396,7 @@ class MainArticlesPage(
target_date_list = ( target_date_list = (
MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.WORK_TIMELINE) MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.WORK_TIMELINE)
.order_by("-date") .order_by("-date")
.live()
.values_list("date", flat=True) .values_list("date", flat=True)
) )
...@@ -440,7 +441,7 @@ class MainArticlesPage( ...@@ -440,7 +441,7 @@ class MainArticlesPage(
ctx["article_timeline_list"] = article_timeline_list ctx["article_timeline_list"] = article_timeline_list
ctx["show_next_timeline_articles"] = MainArticlePage.objects.filter( ctx["show_next_timeline_articles"] = MainArticlePage.objects.filter(
article_type=ARTICLE_TYPES.WORK_TIMELINE article_type=ARTICLE_TYPES.WORK_TIMELINE
).count() > len(article_timeline_list) ).live().count() > len(article_timeline_list)
article_list = ( article_list = (
MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.PRESS_RELEASE) MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.PRESS_RELEASE)
...@@ -462,15 +463,16 @@ class MainArticlesPage( ...@@ -462,15 +463,16 @@ class MainArticlesPage(
"last_article": article_list[-1] "last_article": article_list[-1]
== MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.WORK_TIMELINE) == MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.WORK_TIMELINE)
.order_by("-date") .order_by("-date")
.live()
.last(), .last(),
} }
return JsonResponse(data=data, safe=False) return JsonResponse(data=data, safe=False)
def get_articles_response(self, request): def get_articles_response(self, request):
article_paginator = Paginator( article_paginator = Paginator(
MainArticlePage.objects.filter( MainArticlePage.objects.filter(article_type=ARTICLE_TYPES.PRESS_RELEASE)
article_type=ARTICLE_TYPES.PRESS_RELEASE .order_by("-date", "title")
).order_by("-date", "title"), .live(),
10, 10,
) )
article_page = article_paginator.get_page(request.GET.get("page", 1)) article_page = article_paginator.get_page(request.GET.get("page", 1))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment