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

Jump to bottom

Rettede filtre for Grupper, Forening og Afdelinger #941

Merged
merged 2 commits into from
Aug 20, 2023
Merged

Rettede filtre for Grupper, Forening og Afdelinger #941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ffc43e
Rettede filtre for Grupper, Forening og Afdelinger
mhewel Jul 12, 2023
cdfd0ca
Merge branch 'master' into 937-bug-admin-brugere-filtre-for-foreninge…
rasmusselsmark Aug 20, 2023
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: 18 additions & 8 deletions members/admin/user_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class AdminUserGroupListFilter(admin.SimpleListFilter):
parameter_name = "group"

def lookups(self, request, model_admin):
groupList = ()
groupList = [("none", "(ingen gruppe)")]
for aGroup in Group.objects.all().order_by("name"):
groupList += (
(
Expand All @@ -41,6 +41,8 @@ def lookups(self, request, model_admin):

def queryset(self, request, queryset):
group_id = request.GET.get(self.parameter_name, None)
if group_id == "none":
return queryset.filter(groups__isnull=True)
if group_id:
return queryset.filter(groups=group_id)
return queryset
Expand All @@ -51,7 +53,7 @@ class AdminUserUnionListFilter(admin.SimpleListFilter):
parameter_name = "union"

def lookups(self, request, model_admin):
unionList = ()
unionList = [("none", "(ingen forening)"), ("any", "(mindst en forening)")]
for aUnion in Union.objects.all().order_by("name"):
unionList += (
(
Expand All @@ -63,8 +65,12 @@ def lookups(self, request, model_admin):

def queryset(self, request, queryset):
union_id = request.GET.get(self.parameter_name, None)
if union_id:
return queryset.filter(groups=union_id)
if union_id == "none":
return queryset.filter(adminuserinformation__unions__isnull=True)
elif union_id == "any":
return queryset.exclude(adminuserinformation__unions__isnull=True)
elif union_id:
return queryset.filter(adminuserinformation__unions=union_id)
return queryset


Expand All @@ -73,7 +79,7 @@ class AdminUserDepartmentListFilter(admin.SimpleListFilter):
parameter_name = "department"

def lookups(self, request, model_admin):
departmentList = ()
departmentList = [("none", "(ingen afdeling)"), ("any", "(mindst en afdeling)")]
for aDepartment in Department.objects.all().order_by("name"):
departmentList += (
(
Expand All @@ -84,9 +90,13 @@ def lookups(self, request, model_admin):
return departmentList

def queryset(self, request, queryset):
union_id = request.GET.get(self.parameter_name, None)
if union_id:
return queryset.filter(groups=union_id)
department_id = request.GET.get(self.parameter_name, None)
if department_id == "none":
return queryset.filter(adminuserinformation__departments__isnull=True)
elif department_id == "any":
return queryset.exclude(adminuserinformation__departments__isnull=True)
if department_id:
return queryset.filter(adminuserinformation__departments=department_id)
return queryset


Expand Down
Loading