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

Sortering af Afdelinger og Foreninger er efter Uppercase #939

Merged
merged 2 commits into from
Aug 20, 2023
Merged

Sortering af Afdelinger og Foreninger er efter Uppercase #939

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d305c28
Sortering af Afdelinger og Foreninger er efter Uppercase
mhewel Jul 12, 2023
48fcd65
Merge branch 'master' into 938-bug-admin-brugere-liste-af-afdelinger-…
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
8 changes: 8 additions & 0 deletions members/admin/user_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib import admin
from django.db.models.functions import Upper
from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import Group
from members.models import AdminUserInformation, Person, Union, Department
Expand All @@ -9,6 +10,13 @@ class AdminUserInformationInline(admin.StackedInline):
filter_horizontal = ("departments", "unions")
can_delete = False

def formfield_for_manytomany(self, db_field, request, **kwargs):
if db_field.name == "departments":
kwargs["queryset"] = Department.objects.all().order_by(Upper("name").asc())
if db_field.name == "unions":
kwargs["queryset"] = Union.objects.all().order_by(Upper("name").asc())
return super().formfield_for_manytomany(db_field, request, **kwargs)


class PersonInline(admin.StackedInline):
model = Person
Expand Down
Loading