From 070637bf1d2ac0a5f408eebe332578946f6e7fc8 Mon Sep 17 00:00:00 2001 From: jain Date: Mon, 14 Aug 2023 11:43:59 +0530 Subject: [PATCH] is complete key --- web_admin/serializers/article_serializer.py | 3 ++- web_admin/views/article.py | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/web_admin/serializers/article_serializer.py b/web_admin/serializers/article_serializer.py index f8c7f67..af07bd7 100644 --- a/web_admin/serializers/article_serializer.py +++ b/web_admin/serializers/article_serializer.py @@ -238,7 +238,8 @@ class ArticleListSerializer(serializers.ModelSerializer): def get_is_completed(self, obj): """complete all question""" - junior_article = JuniorArticle.objects.filter(article=obj).last() + context_data = self.context.get('user') + junior_article = JuniorArticle.objects.filter(junior__auth=context_data, article=obj).last() if junior_article: return junior_article.is_completed return False diff --git a/web_admin/views/article.py b/web_admin/views/article.py index e57577e..13c41c2 100644 --- a/web_admin/views/article.py +++ b/web_admin/views/article.py @@ -221,10 +221,7 @@ class ArticleListViewSet(GenericViewSet, mixins.ListModelMixin): :return: list of article """ queryset = self.get_queryset() - count = queryset.count() - paginator = self.pagination_class() - paginated_queryset = paginator.paginate_queryset(queryset, request) - serializer = self.serializer_class(paginated_queryset, many=True) + serializer = self.serializer_class(queryset, context={"user": request.user}, many=True) return custom_response(None, data=serializer.data) class ArticleCardListViewSet(viewsets.ModelViewSet):