From a26023fa3090bc993756446788295fad2f47848e Mon Sep 17 00:00:00 2001 From: Christian Merten Date: Thu, 6 Apr 2023 22:23:02 +0200 Subject: [PATCH] members/admin: replace old permission name by new one --- jdav_web/members/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 65b32c6..1d6bee2 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -54,7 +54,7 @@ class FilteredMemberFieldMixin: if request is None: field.queryset = Member.objects.none() - elif request.user.has_perm('members.may_list_everyone'): + elif request.user.has_perm('members.list_global_member'): field.queryset = Member.objects.all() elif not hasattr(request.user, 'member'): field.queryset = Member.objects.none() @@ -72,7 +72,7 @@ class FilteredMemberFieldMixin: if request is None: field.queryset = Member.objects.none() - elif request.user.has_perm('members.may_list_everyone'): + elif request.user.has_perm('members.list_global_member'): field.queryset = Member.objects.all() elif not hasattr(request.user, 'member'): field.queryset = Member.objects.none() @@ -561,7 +561,7 @@ class MemberNoteListAdmin(admin.ModelAdmin): args=(object_id,))) def may_view_notelist(self, request, memberlist): - return request.user.has_perm('members.may_view_everyone') or \ + return request.user.has_perm('members.view_global_member') or \ ( hasattr(request.user, 'member') and \ all([request.user.member.may_view(m.member) for m in memberlist.membersonlist.all()]) ) @@ -609,7 +609,7 @@ class FreizeitAdmin(CommonAdminMixin, nested_admin.NestedModelAdmin): super().save_model(request, obj, form, change) def may_view_excursion(self, request, memberlist): - return request.user.has_perm('members.may_view_everyone') or \ + return request.user.has_perm('members.view_global_member') or \ ( hasattr(request.user, 'member') and \ all([request.user.member.may_view(m.member) for m in memberlist.membersonlist.all()]) )