Skip to content

Commit

Permalink
add ordering to all admin display fields
Browse files Browse the repository at this point in the history
  • Loading branch information
Svyat committed Nov 16, 2023
1 parent 71d2318 commit 0652e41
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions triggers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,23 +92,23 @@ def get_queryset(self, request):
base_queryset = super().get_queryset(request)
return base_queryset.prefetch_related('events', 'conditions').select_related('action')

@admin.display(description=_('events'))
@admin.display(description=_('events'), ordering="event__polymorphic_ctype")
def display_events(self, obj: Trigger) -> str:
return format_html_join(
'\n',
'<li>{0}</li>',
sorted((str(event).capitalize(),) for event in obj.events.all()),
)

@admin.display(description=_('conditions'))
@admin.display(description=_('conditions'), ordering="condition__polymorphic_ctype")
def display_conditions(self, obj: Trigger):
return format_html_join(
'\n',
'<li>{0}</li>',
sorted((str(condition).capitalize(),) for condition in obj.conditions.all()),
)

@admin.display(description=_('action'))
@admin.display(description=_('action'), ordering="action__polymorphic_ctype")
def display_action(self, obj: Trigger):
return str(obj.action.get_real_instance()).capitalize() if hasattr(obj, 'action') else None

Expand Down

0 comments on commit 0652e41

Please sign in to comment.