Replace allow_rsvp in form with rsvp_state

hasgeek · Nov 20, 2023 · 7f3a2d6 · 7f3a2d6
1 parent 14ac06a
commit 7f3a2d6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/funnel/forms/sync_ticket.py b/funnel/forms/sync_ticket.py
@@ -9,6 +9,7 @@
 from baseframe import __, forms
 
 from ..models import (
+    RSVP_STATE,
     Account,
     AccountEmail,
     Project,
@@ -68,9 +69,8 @@ class ProjectBoxofficeForm(forms.Form):
         validators=[forms.validators.AllowedIf('org')],
         filters=[forms.filters.strip()],
     )
-    allow_rsvp = forms.BooleanField(
-        __("Allow free registrations"),
-        default=False,
+    rsvp_state = forms.RadioField(
+        __("Registrations"), choices=RSVP_STATE.items(), default=RSVP_STATE.NONE
     )
     is_subscription = forms.BooleanField(
         __("Paid tickets are for a subscription"),

diff --git a/funnel/models/membership_mixin.py b/funnel/models/membership_mixin.py
@@ -304,7 +304,7 @@ def replace(
         return new
 
     @with_roles(call={'editor'})
-    def amend_by(self: MembershipType, actor: Account):
+    def amend_by(self, actor: Account):
         """Amend a membership in a `with` context."""
         return AmendMembership(self, actor)
 

diff --git a/funnel/models/project.py b/funnel/models/project.py
@@ -45,7 +45,7 @@
     visual_field_delimiter,
 )
 
-__all__ = ['Project', 'ProjectLocation', 'ProjectRedirect']
+__all__ = ['RSVP_STATE', 'Project', 'ProjectLocation', 'ProjectRedirect']
 
 
 # --- Constants ---------------------------------------------------------------

diff --git a/funnel/views/project.py b/funnel/views/project.py
@@ -589,7 +589,7 @@ def edit_boxoffice_data(self) -> ReturnView:
             obj=SimpleNamespace(
                 org=boxoffice_data.get('org', ''),
                 item_collection_id=boxoffice_data.get('item_collection_id', ''),
-                allow_rsvp=self.obj.allow_rsvp,
+                rsvp_state=self.obj.rsvp_state,
                 is_subscription=boxoffice_data.get('is_subscription', True),
                 register_form_schema=boxoffice_data.get('register_form_schema'),
                 register_button_txt=boxoffice_data.get('register_button_txt', ''),
@@ -598,7 +598,7 @@ def edit_boxoffice_data(self) -> ReturnView:
             model=Project,
         )
         if form.validate_on_submit():
-            form.populate_obj(self.obj)
+            self.obj.rsvp_state = form.rsvp_state.data
             self.obj.boxoffice_data['org'] = form.org.data
             self.obj.boxoffice_data['item_collection_id'] = form.item_collection_id.data
             self.obj.boxoffice_data['is_subscription'] = form.is_subscription.data