Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reverse mark display order

Browse source
This commit is contained in:
doubaniux 2020-07-23 13:36:00 +08:00
parent 16921530b5
commit 45dcf44fdf
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/views.py
View file

@ -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)

6
users/views.py
View file

@ -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)