Improve event registration admin UI.

Author: MarcoSteinacher

django/geno/admin.py

@@ -130,7 +130,15 @@ def __init__(self, model, admin_site):
             and module_name in settings.COHIVA_ADMIN_FIELDS
         ):
             class_name = type(self).__name__
-            for attr in ("fields", "readonly_fields", "list_display", "list_filter"):
+            for attr in (
+                "fields",
+                "fieldsets",
+                "readonly_fields",
+                "search_fields",
+                "autocomplete_fields",
+                "list_display",
+                "list_filter",
+            ):
                 setting_name = f"{class_name}.{attr}"
                 if setting_name in settings.COHIVA_ADMIN_FIELDS[module_name]:
                     setattr(self, attr, settings.COHIVA_ADMIN_FIELDS[module_name][setting_name])
@@ -892,7 +900,7 @@ class RegistrationSlotAdmin(GenoBaseAdmin):
     autocomplete_fields = ["event", "is_backup_for"]
 
 
-class RegistrationSlotInline(admin.TabularInline):
+class RegistrationSlotInline(TabularInline):
     model = RegistrationSlot
     fields = ["name", "alt_text", "max_places", "is_backup_for", "comment"]
 
@@ -909,32 +917,57 @@ def formfield_for_foreignkey(self, db_field, request=None, **kwargs):
 @admin.register(RegistrationEvent)
 class RegistrationEventAdmin(GenoBaseAdmin):
     model = RegistrationEvent
-    fields = [
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "description",
+                    "confirmation_mail_sender",
+                    "confirmation_mail_text",
+                    ("publication_type", "active"),
+                    ("publication_start", "publication_end"),
+                    "show_counter",
+                )
+            },
+        ),
+        (
+            "Anmeldeformular",
+            {
+                "fields": (
+                    ("enable_notes", "enable_telephone"),
+                    "check1_label",
+                    "check2_label",
+                    "check3_label",
+                    "check4_label",
+                    "check5_label",
+                    "text1_label",
+                    "text2_label",
+                    "text3_label",
+                    "text4_label",
+                    "text5_label",
+                ),
+                "classes": ["tab"],
+            },
+        ),
+        (
+            "Zusatzinfos",
+            {
+                "fields": ("registration_link", "comment", "ts_created", "ts_modified"),
+                "classes": ["tab"],
+            },
+        ),
+        ("Verknüpfungen", {"fields": ("links", "backlinks"), "classes": ["tab"]}),
+    )
+    readonly_fields = ["registration_link", "ts_created", "ts_modified", "links", "backlinks"]
+    list_display = [
         "name",
-        "description",
+        "registration_link",
         "confirmation_mail_sender",
-        "confirmation_mail_text",
-        ("publication_type", "active"),
-        ("publication_start", "publication_end"),
-        "show_counter",
-        ("enable_notes", "enable_telephone"),
-        "check1_label",
-        "check2_label",
-        "check3_label",
-        "check4_label",
-        "check5_label",
-        "text1_label",
-        "text2_label",
-        "text3_label",
-        "text4_label",
-        "text5_label",
-        "comment",
-        ("ts_created", "ts_modified"),
-        "links",
-        "backlinks",
+        "active",
+        "ts_created",
     ]
-    readonly_fields = ["ts_created", "ts_modified", "links", "backlinks"]
-    list_display = ["name", "confirmation_mail_sender", "active", "ts_created"]
     ordering = ("-active", "-ts_created")
     list_editable = ["active"]
     search_fields = ["name", "description", "confirmation_mail_sender", "comment"]

django/geno/models.py

@@ -16,6 +16,7 @@
 from django.db.models.signals import post_save, pre_delete
 from django.dispatch.dispatcher import receiver
 from django.template import Template
+from django.urls import NoReverseMatch, reverse
 from django.utils import timezone
 from django.utils.html import format_html, format_html_join, mark_safe
 from filer.fields.file import FilerFileField
@@ -1114,9 +1115,7 @@ class RegistrationEvent(GenoBase):
     publication_end = models.DateTimeField("Ende Anmeldefrist", blank=True, null=True)
     active = models.BooleanField("Aktiv", db_index=True, default=True)
     enable_notes = models.BooleanField("Kommentarfeld anzeigen?", default=False)
-    enable_telephone = models.BooleanField(
-        "Telefonnummer abfragen (zwingend wegen Covid-19)?", default=False
-    )
+    enable_telephone = models.BooleanField("Telefonnummer abfragen?", default=False)
     show_counter = models.BooleanField("Anzahl bisherige Anmeldungen anzeigen?", default=True)
     check1_label = models.CharField(
         "Checkbox-Frage 1",
@@ -1142,6 +1141,22 @@ class RegistrationEvent(GenoBase):
     text4_label = models.CharField("Textfeld-Frage 4", max_length=100, blank=True)
     text5_label = models.CharField("Textfeld-Frage 5", max_length=100, blank=True)
 
+    @property
+    @admin.display(description="Link zum Anmelde-Formular")
+    def registration_link(self):
+        registration_form_viewname = "registration-form"
+        if self.pk:
+            if self.publication_type == "public":
+                try:
+                    url = settings.BASE_URL + reverse(
+                        registration_form_viewname, kwargs={"registration_id": self.pk}
+                    )
+                    return mark_safe(f"<a href='{url}'>{url}</a>")
+                except NoReverseMatch:
+                    return f"[Fehler: Keine URL für '{registration_form_viewname}' gefunden]"
+            return "[Kein öffentlicher Link]"
+        return "Bitte zuerst speichern."
+
     class Meta:
         verbose_name = "Anmeldung-Anlass"
         verbose_name_plural = "Anmeldung-Anlässe"

django/website_example/urls.py

@@ -7,5 +7,5 @@
     ## Redirect root to /admin as long as there is no website in place.
     path("", RedirectView.as_view(url="/admin/", permanent=False), name="root-redirect"),
     # path("", TemplateView.as_view(template_name="website/main.html"), name="website-main"),
-    path("anmeldung/<int:registration_id>/", website_views.registration),
+    path("anmeldung/<int:registration_id>/", website_views.registration, name="registration-form"),
 ]