diff --git a/shared/models/base.py b/shared/models/base.py index ece1c4dfa6173fb174e7a47375adbc845d1dd354..7ab28ff230fdd3c3dc150d7dbbd023067abf4784 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 cb8c35401fd0fe8527ad2e242116cfeb425c4de0..b3d707f63d2ce6115d4342cfbf12a663f88634c9 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"]