From e8f8d3c90850da48c84faf1448516dbf599103de Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 9 Jan 2023 02:32:26 -0500 Subject: [PATCH] fix reset visibility --- journal/views.py | 4 +++- users/data.py | 10 +--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/journal/views.py b/journal/views.py index 7134d28e..2bc520f8 100644 --- a/journal/views.py +++ b/journal/views.py @@ -401,7 +401,9 @@ def _render_list( queryset = queryset.filter(query_item_category(item_category)) else: return HttpResponseBadRequest() - queryset = queryset.filter(q_visible_to(request.user, user)) + queryset = queryset.filter(q_visible_to(request.user, user)).order_by( + "-created_time" + ) paginator = Paginator(queryset, PAGE_SIZE) page_number = request.GET.get("page", default=1) members = paginator.get_page(page_number) diff --git a/users/data.py b/users/data.py index 23b64408..b2abd33d 100644 --- a/users/data.py +++ b/users/data.py @@ -128,15 +128,7 @@ def reset_visibility(request): if request.method == "POST": visibility = int(request.POST.get("visibility")) visibility = visibility if visibility >= 0 and visibility <= 2 else 0 - if settings.ENABLE_NEW_MODEL: - reset_visibility_for_user(request.user, visibility) - else: - BookMark.objects.filter(owner=request.user).update(visibility=visibility) - MovieMark.objects.filter(owner=request.user).update(visibility=visibility) - GameMark.objects.filter(owner=request.user).update(visibility=visibility) - AlbumMark.objects.filter(owner=request.user).update(visibility=visibility) - SongMark.objects.filter(owner=request.user).update(visibility=visibility) - Activity.objects.filter(owner=request.user).update(visibility=visibility) + reset_visibility_for_user(request.user, visibility) messages.add_message(request, messages.INFO, _("已重置。")) return redirect(reverse("users:data"))