Merge pull request 'Reference parent conference in CFP section of weekly email' (#20) from admin into main

Reviewed-on: #20

README.md

@@ -116,7 +116,7 @@ BACKUPS_DIR=/home/ausglamr/backups
 1,23,47 * * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev announce
 
 # 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
 1 4 * * * cd /home/ausglamr/ausglamr && /home/ausglamr/ausglamr/glamr-dev queue_announcements

blogs/admin.py

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

blogs/management/commands/send_weekly_email.py

@@ -133,11 +133,11 @@ class Command(BaseCommand):
         for instance in cfps:
             c_date = instance.closing_date
             title_string = (
-                f"<h4><a href='{instance.event.url}'>{instance.name}</a></h4>"
+                f"<h4><a href='{instance.event.url}'>{instance.event.name} - {instance.name}</a></h4>"
             )
             dates_string = f"<p><strong>Closes:</strong><em>{c_date:%a} {c_date.day} {c_date:%B}</em></p>"
             description_string = (
-                f"<p style='margin-bottom:24px;'>{instance.details}</p>"
+                f"<p>{instance.details}</p><p style='margin-bottom:24px;'>{instance.event.description}</p>"
             )
 
             string_list = [title_string, dates_string, description_string]

requirements.txt

@@ -1,6 +1,6 @@
 beautifulsoup4==4.12.2
 gunicorn==22.0.0
-Django==4.2.11
+Django==4.2.14
 environs==9.5.0
 feedparser==6.0.10
 psycopg2==2.9.5