diff --git a/apps/news/models.py b/apps/news/models.py index 79e2bbd0..3be956a7 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -78,7 +78,7 @@ class NewsQuerySet(TranslationQuerysetMixin): def with_base_related(self): """Return qs with related objects.""" - return self.select_related('news_type', 'country').prefetch_related('tags', 'tags__translation') + return self.select_related('news_type', 'country').prefetch_related('tags', 'tags__translation', 'gallery') def with_extended_related(self): """Return qs with related objects.""" @@ -306,8 +306,9 @@ class News(GalleryMixin, BaseAttributes, TranslatedFieldsMixin, HasTagsMixin, @property def main_image(self): qs = self.news_gallery.main_image() - if qs.exists(): - return qs.order_by('-id').first().image + image_model = qs.order_by('-id').first() + if image_model is not None: + return image_model.image @property def image_url(self):