From 322af9efef76bdfc4ef7fdd2cdb8c3239bacd255 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 14 Nov 2019 17:07:31 +0300 Subject: [PATCH] fix news in_fav --- apps/news/views.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/news/views.py b/apps/news/views.py index 65dd1795..9c0a17e5 100644 --- a/apps/news/views.py +++ b/apps/news/views.py @@ -18,12 +18,13 @@ class NewsMixinView: permission_classes = (permissions.AllowAny,) serializer_class = serializers.NewsBaseSerializer - def get_queryset(self, *args, **kwargs): + def get_queryset(self): """Override get_queryset method.""" qs = models.News.objects.published() \ .with_base_related() \ - .order_by('-is_highlighted', '-created') \ - .annotate_in_favorites(self.request.user) + .annotate_in_favorites(self.request.user) \ + .order_by('-is_highlighted', '-created') + country_code = self.request.country_code if country_code: qs = qs.by_country_code(country_code) @@ -62,8 +63,13 @@ class NewsBackOfficeMixinView: """News back office mixin view.""" permission_classes = (permissions.IsAuthenticated,) - queryset = models.News.objects.with_base_related() \ - .order_by('-is_highlighted', '-created') + + def get_queryset(self): + """Override get_queryset method.""" + qs = models.News.objects.with_base_related() \ + .annotate_in_favorites(self.request.user) \ + .order_by('-is_highlighted', '-created') + return qs class NewsBackOfficeLCView(NewsBackOfficeMixinView,