mirror of
https://github.com/HamzaSha1/zod-backend.git
synced 2025-11-26 08:34:55 +00:00
Merge pull request #330 from KiwiTechLLC/ZBKBCK-52
modified get article card current page method
This commit is contained in:
@ -357,8 +357,9 @@ class ArticleCardlistSerializer(serializers.ModelSerializer):
|
|||||||
"""current page"""
|
"""current page"""
|
||||||
context_data = self.context.get('user')
|
context_data = self.context.get('user')
|
||||||
data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj.article).last()
|
data = JuniorArticle.objects.filter(junior__auth=context_data, article=obj.article).last()
|
||||||
|
total_count = self.context.get('card_count')
|
||||||
if data:
|
if data:
|
||||||
return data.current_card_page
|
return data.current_que_page if data.current_que_page < total_count else data.current_que_page - 1
|
||||||
return NUMBER['zero']
|
return NUMBER['zero']
|
||||||
|
|
||||||
class Meta(object):
|
class Meta(object):
|
||||||
|
|||||||
@ -279,7 +279,8 @@ class ArticleCardListViewSet(viewsets.ModelViewSet):
|
|||||||
try:
|
try:
|
||||||
queryset = self.get_queryset()
|
queryset = self.get_queryset()
|
||||||
# article card list
|
# article card list
|
||||||
serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user}, many=True)
|
serializer = ArticleCardlistSerializer(queryset, context={"user": self.request.user,
|
||||||
|
"card_count": queryset.count()}, many=True)
|
||||||
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
return custom_response(None, serializer.data, response_status=status.HTTP_200_OK)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
return custom_error_response(str(e), response_status=status.HTTP_400_BAD_REQUEST)
|
||||||
|
|||||||
Reference in New Issue
Block a user