Skip to content

Commit

Permalink
attr to bypass
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Jun 19, 2024
1 parent e47900c commit ebdfac3
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions edc_sites/admin/site_model_admin_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class SiteModelAdminMixin:

limit_related_to_current_country: list[str] = None
limit_related_to_current_site: list[str] = None
user_may_view_other_sites = False

@admin.display(description="Site", ordering="site__id")
def site_code(self, obj=None):
Expand All @@ -48,18 +49,20 @@ def get_list_filter(self, request) -> tuple[str | Type[SimpleListFilter], ...]:
"""
list_filter = super().get_list_filter(request)
list_filter = [x for x in list_filter if x != "site" and x != SiteListFilter]
if sites.user_may_view_other_sites(request):
if self.user_may_view_other_sites or sites.user_may_view_other_sites(request):
try:
index = list_filter.index("created")
except ValueError:
index = len(list_filter)
list_filter.insert(index, SiteListFilter)
return tuple(list_filter)

def get_list_display(self, request):
def get_list_display(self, request) -> tuple[str]:
"""Insert `site` after the first column"""
list_display = super().get_list_display(request)
if sites.user_may_view_other_sites(request) and "site" not in list_display:
if (
self.user_may_view_other_sites or sites.user_may_view_other_sites(request)
) and "site" not in list_display:
list_display = (list_display[0],) + (self.site_code,) + list_display[1:]
elif "site" in list_display:
list_display = tuple(
Expand Down

0 comments on commit ebdfac3

Please sign in to comment.