diff --git a/foundation/admin.py b/foundation/admin.py index 1c905040e6..a929e467f9 100644 --- a/foundation/admin.py +++ b/foundation/admin.py @@ -50,10 +50,16 @@ class BusinessInline(admin.StackedInline): class ActionItemInline(admin.StackedInline): model = models.ActionItem + verbose_name_plural = _( + "Action Items (aka todos. " + "Combine the last meeting's remaining action items, " + "and add any new ones)" + ) @admin.register(models.Meeting) class MeetingAdmin(admin.ModelAdmin): + change_form_template = "admin/foundation/meeting/change_form.html" fieldsets = ( ( "Metadata", diff --git a/foundation/migrations/0007_alter_business_body_alter_meeting_board_attendees.py b/foundation/migrations/0007_alter_business_body_alter_meeting_board_attendees.py new file mode 100644 index 0000000000..295c4dc473 --- /dev/null +++ b/foundation/migrations/0007_alter_business_body_alter_meeting_board_attendees.py @@ -0,0 +1,23 @@ +# Generated by Django 5.1.5 on 2025-03-05 10:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('foundation', '0006_hardcode_currency_choices'), + ] + + operations = [ + migrations.AlterField( + model_name='business', + name='body', + field=models.TextField(help_text="Supports reStructuredText. See supported formatting."), + ), + migrations.AlterField( + model_name='meeting', + name='board_attendees', + field=models.ManyToManyField(help_text='Make sure to choose the correct year', related_name='meetings_attended', to='foundation.boardmember'), + ), + ] diff --git a/foundation/models.py b/foundation/models.py index 598ee21162..40acd32783 100644 --- a/foundation/models.py +++ b/foundation/models.py @@ -82,7 +82,9 @@ class Meeting(models.Model): BoardMember, related_name="meetings_led", on_delete=models.CASCADE ) board_attendees = models.ManyToManyField( - BoardMember, related_name="meetings_attended" + BoardMember, + related_name="meetings_attended", + help_text=_("Make sure to choose the correct year"), ) non_board_attendees = models.ManyToManyField( NonBoardAttendee, related_name="meetings_attended", blank=True @@ -201,7 +203,14 @@ class Business(models.Model): ) title = models.CharField(max_length=255) - body = models.TextField() + body = models.TextField( + help_text=_( + "Supports reStructuredText. " + "See " + "supported formatting." + ) + ) + body_html = models.TextField(editable=False) business_type = models.CharField(max_length=25, choices=TYPE_CHOICES) meeting = models.ForeignKey( diff --git a/foundation/templates/admin/foundation/meeting/change_form.html b/foundation/templates/admin/foundation/meeting/change_form.html new file mode 100644 index 0000000000..ea0c2f6db1 --- /dev/null +++ b/foundation/templates/admin/foundation/meeting/change_form.html @@ -0,0 +1,25 @@ +{% extends "admin/change_form.html" %} {% load i18n %} \ {% block extrastyle %} + {{ block.super }} + +{% endblock %} {% block content %} +
+
+ Note: Meeting notes go live and on RSS on Save, make sure to complete all + relevant fields. +
+
+ {{ block.super }} {% endblock %}