From 74b1beda927e985686bc9f2c79aa0bbfdf76f0e2 Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 11 Dec 2020 00:38:42 +0000 Subject: [PATCH] sorting choice fields --- fet2020/members/admin.py | 13 ++++++++----- fet2020/posts/forms.py | 3 +++ fet2020/tasks/forms.py | 4 +++- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py index 9bf4617b..2e94f8f9 100644 --- a/fet2020/members/admin.py +++ b/fet2020/members/admin.py @@ -70,9 +70,10 @@ class MemberAdmin(admin.ModelAdmin): ) }), ) - list_display = ['nickname', 'firstname', 'surname', 'mailaccount', 'role'] inlines = (JobOverviewInline,) + list_display = ['nickname', 'firstname', 'surname', 'mailaccount', 'role'] + ordering = ['firstname', ] search_fields = ['firstname', 'surname', 'nickname', 'mailaccount'] list_filter = [MemberRoleFilter] @@ -98,10 +99,11 @@ class MemberAdmin(admin.ModelAdmin): class JobAdmin(admin.ModelAdmin): form = JobForm model = Job - list_display = ['name'] inlines = (ActiveMemberInline, InactiveMemberInline) - search_fields = ['name'] + list_display = ['name', ] + ordering = ['name', ] + search_fields = ['name', ] def add_view(self, request, form_url='', extra_context=None): extra_context = extra_context or {} @@ -125,10 +127,11 @@ class JobAdmin(admin.ModelAdmin): class JobGroupAdmin(admin.ModelAdmin): form = JobGroupForm model = JobGroup - list_display = ['name', 'is_pinned', ] inlines = (JobInline, ) - search_fields = ['name'] + list_display = ['name', 'is_pinned', ] + ordering = ['name', ] + search_fields = ['name', ] def add_view(self, request, form_url='', extra_context=None): extra_context = extra_context or {} diff --git a/fet2020/posts/forms.py b/fet2020/posts/forms.py index 8922e0cc..f66ec70d 100644 --- a/fet2020/posts/forms.py +++ b/fet2020/posts/forms.py @@ -59,6 +59,7 @@ class NewsForm(PostForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set + self.fields['author'].queryset = self.fields['author'].queryset.order_by('username') class EventForm(PostForm): @@ -98,6 +99,7 @@ class EventForm(PostForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set + self.fields['author'].queryset = self.fields['author'].queryset.order_by('username') self.fields['event_start'].required = True self.fields['event_end'].required = True @@ -129,6 +131,7 @@ class FetMeetingForm(EventForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set + self.fields['author'].queryset = self.fields['author'].queryset.order_by('username') self.fields['event_start'].required = True self.fields['event_end'].required = False diff --git a/fet2020/tasks/forms.py b/fet2020/tasks/forms.py index 4c261fb7..5f83602b 100644 --- a/fet2020/tasks/forms.py +++ b/fet2020/tasks/forms.py @@ -29,6 +29,7 @@ class TaskAdminForm(forms.ModelForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set self.fields['assigned_to'].empty_label = "Alle" + self.fields['assigned_to'].queryset = self.fields['assigned_to'].queryset.order_by('username') class TaskForm(forms.ModelForm): @@ -58,13 +59,14 @@ class TaskForm(forms.ModelForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) # to get the self.fields set self.fields['assigned_to'].empty_label = "Alle" + self.fields['assigned_to'].queryset = self.fields['assigned_to'].queryset.order_by('username') class TaskListForm(forms.ModelForm): users = forms.ModelMultipleChoiceField( label="Benutzer", help_text="Es können nur die Benutzer ausgewählt werden, die sich auf der Homepage angemeldet haben.", - queryset=User.objects.all(), + queryset=User.objects.all().order_by('username'), widget=FilteredSelectMultiple("User", is_stacked=False) )