diff --git a/common/views.py b/common/views.py index b0e1e7f3..bf1827e4 100644 --- a/common/views.py +++ b/common/views.py @@ -26,13 +26,16 @@ TAG_NUMBER_ON_LIST = 5 def home(request): if request.method == 'GET': - do_book_marks = request.user.user_bookmarks.filter(status=MarkStatusEnum.DO) + do_book_marks = request.user.user_bookmarks.filter( + status=MarkStatusEnum.DO).order_by("-edited_time") do_books_more = True if do_book_marks.count() > BOOKS_PER_SET else False - wish_book_marks = request.user.user_bookmarks.filter(status=MarkStatusEnum.WISH) + wish_book_marks = request.user.user_bookmarks.filter( + status=MarkStatusEnum.WISH).order_by("-edited_time") wish_books_more = True if wish_book_marks.count() > BOOKS_PER_SET else False - collect_book_marks = request.user.user_bookmarks.filter(status=MarkStatusEnum.COLLECT) + collect_book_marks = request.user.user_bookmarks.filter( + status=MarkStatusEnum.COLLECT).order_by("-edited_time") collect_books_more = True if collect_book_marks.count() > BOOKS_PER_SET else False reports = Report.objects.order_by('-submitted_time').filter(is_read=False) diff --git a/users/views.py b/users/views.py index c7277d14..ca4416d4 100644 --- a/users/views.py +++ b/users/views.py @@ -302,9 +302,11 @@ def book_list(request, id, status): 'msg': msg, } ) - queryset = BookMark.get_available_user_data(user, relation['following']).filter(status=MarkStatusEnum[status.upper()]) + queryset = BookMark.get_available_user_data(user, relation['following']).filter( + status=MarkStatusEnum[status.upper()]).order_by("-edited_time") else: - queryset = BookMark.objects.filter(owner=user, status=MarkStatusEnum[status.upper()]) + queryset = BookMark.objects.filter( + owner=user, status=MarkStatusEnum[status.upper()]).order_by("-edited_time") paginator = Paginator(queryset, ITEMS_PER_PAGE) page_number = request.GET.get('page', default=1) marks = paginator.get_page(page_number)