From 3c15c3b4a3de6330c08bff3762e83554391051e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <git@imaniti.org>
Date: Tue, 16 Jan 2024 13:07:33 +0100
Subject: [PATCH] fix shared articles
---
shared/models/base.py | 1 +
shared/models/main.py | 10 +++-------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/shared/models/base.py b/shared/models/base.py
index ece1c4df..7ab28ff2 100644
--- a/shared/models/base.py
+++ b/shared/models/base.py
@@ -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()),
}
diff --git a/shared/models/main.py b/shared/models/main.py
index cb8c3540..b3d707f6 100644
--- a/shared/models/main.py
+++ b/shared/models/main.py
@@ -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"]
--
GitLab