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

fix shared articles

parent 6077d281
No related branches found
No related tags found
2 merge requests!876Fix shared articles & release elections web,!874Fix shared articles
Pipeline #16275 passed
......@@ -519,6 +519,7 @@ class ArticlesMixin:
key_fields_default_values = {
"union_thumb_image_id": F("search_image_id"),
"union_is_black": Value(False, models.BooleanField()),
"union_article_type": Value(2, models.PositiveSmallIntegerField()),
}
......
......@@ -267,7 +267,6 @@ class MainHomePageMixin(
self.append_all_shared_articles_query(
self.article_page_model.objects.live().all()
)
.live()
.order_by("-union_date")[:3]
)
......@@ -448,9 +447,8 @@ 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)
self.root_page.article_page_model.objects.filter(filter).live().all()
)
.live()
.order_by("-union_date")
)
......@@ -550,9 +548,8 @@ class MainArticlesPageMixin(
) != 0 and (
self.materialize_shared_articles_query(
self.append_all_shared_articles_query(
self.root_page.article_page_model.objects.filter(search_filter)
self.root_page.article_page_model.objects.filter(search_filter).live().all()
)
.live()
.order_by("union_date")[:2] # LIMIT 2
)[0]
not in article_timeline_list[-1]["articles"]
......@@ -597,9 +594,8 @@ class MainArticlesPageMixin(
self.append_all_shared_articles_query(
self.root_page.article_page_model.objects.filter(
search_filter
).live().all()
)
)
.live()
.order_by("union_date")[:2] # LIMIT 2
)[0]
not in article_timeline_list[-1]["articles"]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment