Allow editing package benefits from package form

Author: JacobCoffee

apps/sponsors/manage/forms.py

@@ -102,6 +102,12 @@ def __init__(self, *args, **kwargs):
 class SponsorshipPackageManageForm(forms.ModelForm):
     """Form for creating and editing sponsorship packages."""
 
+    benefits = forms.ModelMultipleChoiceField(
+        queryset=SponsorshipBenefit.objects.none(),
+        required=False,
+        widget=forms.CheckboxSelectMultiple(),
+    )
+
     class Meta:
         """Meta options."""
 
@@ -114,6 +120,7 @@ class Meta:
             "logo_dimension",
             "year",
             "allow_a_la_carte",
+            "benefits",
         ]
         widgets = {
             "name": forms.TextInput(
@@ -131,12 +138,36 @@ class Meta:
         }
 
     def __init__(self, *args, **kwargs):
-        """Initialize form with year choices."""
+        """Initialize form with year choices and year-specific benefits."""
         super().__init__(*args, **kwargs)
         self.fields["year"].widget = forms.Select(
             choices=[("", "---"), *year_choices()],
             attrs={"style": "padding:8px 12px;border:1px solid #ccc;border-radius:4px;font-size:14px;"},
         )
+        filter_year = None
+        if self.is_bound and self.data.get(self.add_prefix("year")):
+            filter_year = self.data.get(self.add_prefix("year"))
+        elif self.instance and self.instance.year:
+            filter_year = self.instance.year
+        elif self.initial.get("year"):
+            filter_year = self.initial["year"]
+        else:
+            with contextlib.suppress(SponsorshipCurrentYear.DoesNotExist):
+                filter_year = SponsorshipCurrentYear.get_year()
+
+        if filter_year:
+            self.fields["benefits"].queryset = (
+                SponsorshipBenefit.objects.filter(year=filter_year)
+                .select_related("program")
+                .order_by("program__order", "order", "name")
+            )
+        if self.instance and self.instance.pk:
+            self.initial.setdefault("benefits", self.instance.benefits.values_list("pk", flat=True))
+
+    def _save_m2m(self):
+        """Persist reverse benefit associations after the package is saved."""
+        super()._save_m2m()
+        self.instance.benefits.set(self.cleaned_data["benefits"])
 
 
 class CloneYearForm(forms.Form):

apps/sponsors/templates/sponsors/manage/package_form.html

@@ -90,6 +90,26 @@ <h2 style="font-size:18px;font-weight:700;color:#1a1a2e;margin:0 0 4px;">
                 </div>
             </fieldset>
 
+            <fieldset class="manage-fieldset">
+                <legend>Included Benefits</legend>
+                <div class="form-group" style="margin-bottom:0;">
+                    <label for="id_benefits">
+                        Benefits{% if not is_create and benefit_count %} <span class="tag tag-blue">{{ benefit_count }}</span>{% endif %}
+                    </label>
+                    {% if form.fields.benefits.queryset %}
+                    <div class="checkbox-list">
+                        {% for checkbox in form.benefits %}
+                        {{ checkbox }}
+                        {% endfor %}
+                    </div>
+                    <span class="helptext">Checked benefits are included in this package. Uncheck to remove them.</span>
+                    {% else %}
+                    <p style="margin:0;color:#777;font-size:13px;">No benefits are available for the selected year yet.</p>
+                    {% endif %}
+                    {% if form.benefits.errors %}<div class="field-errors">{{ form.benefits.errors.0 }}</div>{% endif %}
+                </div>
+            </fieldset>
+
             <div style="display:flex;gap:10px;align-items:center;padding-top:8px;">
                 <button type="submit" class="btn btn-primary">
                     {% if is_create %}Create Package{% else %}Save Changes{% endif %}