Remove references to additional fields on groups

aleksis/apps/paweljong/forms.py

@@ -305,22 +305,6 @@ class RegisterEventAdditional(ExtensibleForm):
             "comment": _("You can write down any remarks you want to tell us here."),
         }
 
-    def __init__(self, event, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        self.__class__.layout_filled = getattr(self.__class__, "layout_filled", False)
-
-        for field in event.linked_group.additional_fields.all():
-            field_instance = getattr(fields, field.field_type)(
-                required=field.required,
-                help_text=field.help_text,
-            )
-            self.fields[field.title] = field_instance
-            if not self.layout_filled:
-                node = Fieldset(f"{field.title}", f"{field.title}")
-                self.add_node_to_layout(node)
-        self.__class__.layout_filled = True
-
 
 class RegisterEventFinancial(ExtensibleForm):
     """Form to register for an event."""

aleksis/apps/paweljong/tables.py

@@ -157,10 +157,3 @@ class ChildGroupsTable(tables.Table):
         verbose_name=_("Add persons"),
         text=_("Add persons"),
     )
-
-
-class AdditionalFieldsTable(tables.Table):
-    class Meta:
-        attrs = {"class": "highlight"}
-
-    title = tables.LinkColumn("edit_additional_field_by_id", args=[A("id")])

aleksis/apps/paweljong/templates/paweljong/event/detail.html

@@ -76,11 +76,7 @@
   </div>
 
   <div class="row">
-    <div class="col s3">
-      <h5>{% blocktrans %}Additional fields{% endblocktrans %}</h5>
-      {% render_table additional_fields_table %}
-    </div>
-    <div class="col s9">
+    <div class="col s12">
       <h5>{% blocktrans %}Child groups{% endblocktrans%}</h5>
       {% render_table child_groups_table %}
     </div>

aleksis/apps/paweljong/views.py

@@ -54,7 +54,6 @@ from .models import (
     Voucher,
 )
 from .tables import (
-    AdditionalFieldsTable,
     ChildGroupsTable,
     EventRegistrationsTable,
     InfoMailingsTable,
@@ -468,9 +467,6 @@ class RegisterEventWizardView(SessionWizardView):
         kwargs = super().get_form_kwargs()
         if step == "email":
             kwargs["request"] = self.request
-        if step == "additional":
-            event = Event.objects.get(slug=self.kwargs["slug"])
-            kwargs["event"] = event
         if step == "consent":
             event = Event.objects.get(slug=self.kwargs["slug"])
             kwargs["event"] = event
@@ -649,10 +645,6 @@ class RegisterEventWizardView(SessionWizardView):
             school_class=cleaned_data_contact_details["school_class"],
             school_place=cleaned_data_contact_details["school_place"],
         )
-        for field in event.linked_group.additional_fields.all():
-            registration.extended_data[
-                slugify(field.title).replace("-", "_")
-            ] = cleaned_data_additional[field.title]
 
         for field in cleaned_data_consent:
             if not field.startswith("consent_"):
@@ -981,12 +973,6 @@ class EventDetailView(PermissionRequiredMixin, DetailView):
         RequestConfig(self.request).configure(child_groups_table)
         context["child_groups_table"] = child_groups_table
 
-        # Additional fields table
-        additional_fields = self.object.linked_group.additional_fields.all()
-        additional_fields_table = AdditionalFieldsTable(additional_fields)
-        RequestConfig(self.request).configure(additional_fields_table)
-        context["additional_fields_table"] = additional_fields_table
-
         return context