Skip to content
Snippets Groups Projects
Commit 5ed2748f authored by HeJ's avatar HeJ
Browse files

fix per-conference permissions by querying the correct app_label in CM.all_permissions

parent 2ff83123
Branches
Tags
No related merge requests found
...@@ -126,6 +126,7 @@ class AuthDebugView(LoginRequiredMixin, ConferenceMixin, View): ...@@ -126,6 +126,7 @@ class AuthDebugView(LoginRequiredMixin, ConferenceMixin, View):
'active': u.is_active, 'active': u.is_active,
'flags': [], 'flags': [],
'groups': list(u.groups.values_list('name', flat=True)), 'groups': list(u.groups.values_list('name', flat=True)),
'permissions': list(str(x) for x in u.get_all_permissions()),
} }
if u.is_superuser: if u.is_superuser:
result['global']['flags'].append('superuser') result['global']['flags'].append('superuser')
...@@ -138,7 +139,11 @@ class AuthDebugView(LoginRequiredMixin, ConferenceMixin, View): ...@@ -138,7 +139,11 @@ class AuthDebugView(LoginRequiredMixin, ConferenceMixin, View):
'active_angel': member.active_angel, 'active_angel': member.active_angel,
'pages': member.static_page_groups, 'pages': member.static_page_groups,
'groups': list(member.permission_groups.values_list('name', flat=True)), 'groups': list(member.permission_groups.values_list('name', flat=True)),
'permissions': list(str(x) for x in member.get_permission_groups_permissions()),
} }
result['combined_permissions'] = list(str(x) for x in member.all_permissions)
else: else:
result['member'] = False result['member'] = False
......
...@@ -44,7 +44,7 @@ class ConferenceMember(models.Model): ...@@ -44,7 +44,7 @@ class ConferenceMember(models.Model):
def get_permission_groups_permissions(self): def get_permission_groups_permissions(self):
"""Returns only the permission codenames which are given via the associated permission_groups of this ConferenceMember instance.""" """Returns only the permission codenames which are given via the associated permission_groups of this ConferenceMember instance."""
my_permissions = set(self.permission_groups.values_list('permissions__codename', flat=True)) my_permissions = set('.'.join(x) for x in self.permission_groups.values_list('permissions__content_type__app_label', 'permissions__codename'))
return my_permissions return my_permissions
@cached_property @cached_property
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment