Merge remote-tracking branch 'origin/main' into release

sponsors/admin.py

@@ -983,7 +983,7 @@ def benefits_with_assets(self):
  return {str(b.id): b for b in benefits}
 
  def lookups(self, request, model_admin):
- return [(k, b.name) for k, b in self.benefits_with_assets.items()]
+ return [(k, f"{b.name} ({b.year})") for k, b in self.benefits_with_assets.items()]
 
  def queryset(self, request, queryset):
  benefit = self.benefits_with_assets.get(self.value())

sponsors/migrations/0102_auto_20240509_2037.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.28 on 2024-05-09 20:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('sponsors', '0101_sponsor_linked_in_page_url'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='textasset',
+ name='text',
+ field=models.TextField(blank=True, default=''),
+ ),
+ ]

sponsors/models/assets.py

@@ -106,7 +106,7 @@ def value(self, value):
 
 
 class TextAsset(GenericAsset):
- text = models.TextField(default="")
+ text = models.TextField(default="", blank=True)
 
  def __str__(self):
  return f"Text asset: {self.internal_name}"