Merge pull request 'add search in admin models' (#19) from admin into main

Reviewed-on: #19
This commit is contained in:
Hugh Rundle 2024-11-09 09:52:56 +11:00
commit e814c9f981
2 changed files with 9 additions and 2 deletions

View file

@ -116,7 +116,7 @@ BACKUPS_DIR=/home/ausglamr/backups
1,23,47 * * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev announce 1,23,47 * * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev announce
# Check feeds hourly on the eleventh minute # Check feeds hourly on the eleventh minute
11 * * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev check_feeds 11 * * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev check_feeds
# Queue event announcements daily at 4:01am # Queue event announcements daily at 4:01am
1 4 * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev queue_announcements 1 4 * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev queue_announcements

View file

@ -131,6 +131,7 @@ class Blog(admin.ModelAdmin):
"active", "active",
) )
ordering = ["approved", "-suspended", "-failing"] ordering = ["approved", "-suspended", "-failing"]
search_fields = ["title", "author_name", "url"]
actions = [approve, unapprove, suspend, unsuspend, activate, disable] actions = [approve, unapprove, suspend, unsuspend, activate, disable]
@ -140,6 +141,7 @@ class Article(admin.ModelAdmin):
date_hierarchy = "pubdate" date_hierarchy = "pubdate"
list_display = ("title", "blog_title", "pubdate") list_display = ("title", "blog_title", "pubdate")
search_fields = ["title", "author_name", "blog_title", "url"]
def blog_title(self, obj): # pylint: disable=no-self-use def blog_title(self, obj): # pylint: disable=no-self-use
"""get the title of the parent blog""" """get the title of the parent blog"""
@ -151,7 +153,7 @@ class Tag(admin.ModelAdmin):
"""display settings for tags""" """display settings for tags"""
list_display = ("name",) list_display = ("name",)
search_fields = ["name"]
@admin.register(models.Event) @admin.register(models.Event)
class Event(admin.ModelAdmin): class Event(admin.ModelAdmin):
@ -166,6 +168,7 @@ class Event(admin.ModelAdmin):
"start_date", "start_date",
) )
ordering = ["approved", "announcements"] ordering = ["approved", "announcements"]
search_fields = ["name", "description", "url"]
actions = [approve, unapprove] actions = [approve, unapprove]
@ -176,6 +179,7 @@ class CallForPapers(admin.ModelAdmin):
list_display = ("name", "event", "approved", "closing_date") list_display = ("name", "event", "approved", "closing_date")
list_select_related = ("event",) list_select_related = ("event",)
ordering = ["approved", "closing_date"] ordering = ["approved", "closing_date"]
search_fields = ["event__name", "event__url", "details"]
actions = [approve, unapprove] actions = [approve, unapprove]
@ -185,6 +189,7 @@ class Group(admin.ModelAdmin):
list_display = ("name", "approved", "category", "description") list_display = ("name", "approved", "category", "description")
ordering = ["approved", "name"] ordering = ["approved", "name"]
search_fields = ["name", "description", "url"]
actions = [approve, unapprove] actions = [approve, unapprove]
@ -200,6 +205,7 @@ class Newsletter(admin.ModelAdmin):
"active", "active",
) )
ordering = ["approved", "-failing"] ordering = ["approved", "-failing"]
search_fields = ["name", "description", "url", "author_name"]
actions = [approve, unapprove, suspend, activate, disable] actions = [approve, unapprove, suspend, activate, disable]
@ -209,6 +215,7 @@ class Edition(admin.ModelAdmin):
date_hierarchy = "pubdate" date_hierarchy = "pubdate"
list_display = ("title", "newsletter_name", "pubdate") list_display = ("title", "newsletter_name", "pubdate")
search_fields = ["title", "description", "url", "newsletter__name", "author_name"]
def newsletter_name(self, obj): # pylint: disable=no-self-use def newsletter_name(self, obj): # pylint: disable=no-self-use
"""get the title of the parent newsletter""" """get the title of the parent newsletter"""