filtering by current_year where necessary

Author: ewdurbin

sponsors/admin.py

@@ -258,7 +258,7 @@ class TargetableEmailBenefitsFilter(admin.SimpleListFilter):
     @cached_property
     def benefits(self):
         qs = EmailTargetableConfiguration.objects.all().values_list("benefit_id", flat=True)
-        benefits = SponsorshipBenefit.objects.filter(id__in=Subquery(qs))
+        benefits = SponsorshipBenefit.objects.filter(id__in=Subquery(qs), year=SponsorshipCurrentYear.get_year())
         return {str(b.id): b for b in benefits}
 
     def lookups(self, request, model_admin):

sponsors/forms.py

@@ -127,6 +127,7 @@ def get_package(self):
         if not pkg_benefits and standalone:  # standalone only
             pkg, _ = SponsorshipPackage.objects.get_or_create(
                 slug="standalone-only",
+                year=SponsorshipCurrentYear.get_year(),
                 defaults={"name": "Standalone Only", "sponsorship_amount": 0},
             )