From ab3666b03d75b3158d671afb24b4cfc75e25511b Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Wed, 5 Feb 2020 16:29:13 +0300 Subject: [PATCH] fix news states --- apps/news/models.py | 4 ---- apps/news/views.py | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/apps/news/models.py b/apps/news/models.py index dc01b88c..a792fc18 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -105,10 +105,6 @@ class NewsQuerySet(TranslationQuerysetMixin): """Return qs with related objects.""" return self.select_related('created_by', 'agenda', 'banner') - def visible(self): - """Narrows qs by excluding invisible for API (at all) news""" - return self.exclude(state=self.model.REMOVE) - def by_type(self, news_type): """Filter News by type""" return self.filter(news_type__name=news_type) diff --git a/apps/news/views.py b/apps/news/views.py index ff6b165e..b0c11e08 100644 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -26,7 +26,6 @@ class NewsMixinView: """Override get_queryset method.""" qs = models.News.objects.published() \ .with_base_related() \ - .visible() \ .annotate_in_favorites(self.request.user) \ .order_by('-is_highlighted', '-publication_date', '-publication_time') @@ -44,7 +43,7 @@ class NewsMixinView: return qs def get_object(self): - instance = self.get_queryset().visible().with_base_related().filter( + instance = self.get_queryset().with_base_related().filter( slugs__values__contains=[self.kwargs['slug']] ).first() @@ -162,7 +161,7 @@ class NewsBackOfficeLCView(NewsBackOfficeMixinView, def get_queryset(self): """Override get_queryset method.""" - qs = super().get_queryset().with_extended_related().visible() + qs = super().get_queryset().with_extended_related() if 'ordering' in self.request.query_params: self.request.GET._mutable = True if '-publication_datetime' in self.request.query_params['ordering']: