From a8306b4dca381a6b50d97433ca778db662b9eb8d Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Jan 2023 02:25:55 -0500 Subject: [PATCH] fix order in profile page --- journal/urls.py | 2 +- journal/views.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/journal/urls.py b/journal/urls.py index 1d511892..1abb78cc 100644 --- a/journal/urls.py +++ b/journal/urls.py @@ -87,7 +87,7 @@ urlpatterns = [ name="user_review_list", ), re_path( - r"^users/(?P[A-Za-z0-9_\-.@]+)/tags/(?P[^/]+)/$", + r"^users/(?P[A-Za-z0-9_\-.@]+)/tags/(?P.+)/$", user_tag_member_list, name="user_tag_member_list", ), diff --git a/journal/views.py b/journal/views.py index 72dd4a37..7134d28e 100644 --- a/journal/views.py +++ b/journal/views.py @@ -561,7 +561,11 @@ def profile(request, user_name): for category in visbile_categories: shelf_list[category] = {} for shelf_type in ShelfType: - members = user.shelf_manager.get_members(shelf_type, category).filter(qv) + members = ( + user.shelf_manager.get_members(shelf_type, category) + .filter(qv) + .order_by("-created_time") + ) shelf_list[category][shelf_type] = { "title": user.shelf_manager.get_title(shelf_type, category), "count": members.count(), @@ -571,6 +575,7 @@ def profile(request, user_name): Review.objects.filter(owner=user) .filter(qv) .filter(query_item_category(category)) + .order_by("-created_time") ) shelf_list[category]["reviewed"] = { "title": "评论过的" + category.label, @@ -578,7 +583,7 @@ def profile(request, user_name): "members": reviews[:5].prefetch_related("item"), } collections = ( - Collection.objects.filter(owner=user).filter(qv).order_by("-edited_time") + Collection.objects.filter(owner=user).filter(qv).order_by("-created_time") ) liked_collections = ( Like.user_likes_by_class(user, Collection)