sorting choice fields
This commit is contained in:
@@ -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 {}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user