Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove add site/user from Role admin (#943) #1014

Merged
merged 2 commits into from
Jun 6, 2024
Merged

Remove add site/user from Role admin (#943) #1014

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6dd1be
Remove add site/user from Role admin (#943)
jochenklar Jun 3, 2024
cc45bd7
Add distinct to roles count and rename get_sites_for_role
jochenklar Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions rdmo/accounts/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,29 @@ class RoleAdmin(admin.ModelAdmin):

list_display = ('user', 'email', 'members', 'managers', 'editors', 'reviewers')

readonly_fields = ('user', )

def get_queryset(self, request):
return Role.objects.prefetch_related(
'member', 'manager', 'editor', 'reviewer').annotate(
Count('member'), Count('manager'), Count('editor'), Count('reviewer'),
Count('member', distinct=True),
Count('manager', distinct=True),
Count('editor', distinct=True),
Count('reviewer', distinct=True),
sites_count=Value(Site.objects.count())
)

def get_form(self, request, obj=None, **kwargs):
form = super().get_form(request, obj, **kwargs)
form.base_fields['member'].widget.can_add_related = False
form.base_fields['manager'].widget.can_add_related = False
form.base_fields['editor'].widget.can_add_related = False
form.base_fields['reviewer'].widget.can_add_related = False

return form

@staticmethod
def render_all_sites_or_join(obj, field_name: str) -> str:
def get_sites_for_role(obj, field_name: str) -> str:
if getattr(obj, f'{field_name}__count', 0) == obj.sites_count:
return 'all Sites'
return ', '.join([site.domain for site in getattr(obj, field_name).all()])
Expand All @@ -47,13 +61,13 @@ def email(self, obj):
return obj.user.email

def members(self, obj):
return self.render_all_sites_or_join(obj, 'member')
return self.get_sites_for_role(obj, 'member')

def managers(self, obj):
return self.render_all_sites_or_join(obj, 'manager')
return self.get_sites_for_role(obj, 'manager')

def editors(self, obj):
return self.render_all_sites_or_join(obj, 'editor')
return self.get_sites_for_role(obj, 'editor')

def reviewers(self, obj):
return self.render_all_sites_or_join(obj, 'reviewer')
return self.get_sites_for_role(obj, 'reviewer')
Loading