Merged migrations and minor improvements

dav_events/migrations/0035_merge_20201103_1112.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2020-11-03 10:12
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dav_events', '0034_auto_20201015_1738'),
+        ('dav_events', '0034_eventchange'),
+    ]
+
+    operations = [
+    ]

dav_events/models/event.py

@@ -505,6 +505,7 @@ class Event(models.Model):
             'course_goal_6': self.course_goal_6,
             'planned_publication_date': self.planned_publication_date,
             'internal_note': self.internal_note,
+            'registration_closed': self.registration_closed,
         }
         if context is not None:
             r.update(context)

dav_events/templates/dav_events/event/default.txt

@@ -54,6 +54,7 @@
 {% trans 'Schwierigkeitsnivau' %}: {{ event.get_level_display }}
 {% if event.sport == 'S' %}{% trans 'Skiliftbenutzung' %}: {% if event.ski_list %}{% trans 'Ja' %}{% else %}{% trans 'Nein' %}{% endif %}
 {% endif %}{% trans 'Gelände' %}: {{ event.get_terrain_display }}
+{% trans 'Anmeldung' %}: {% if registration_required %}{% if registration_closed %}{% trans 'Geschlossen' %}{% else %}{% trans 'Erforderlich' %}{% endif %}{% else %}{% trans 'Nicht erforderlich' %}{% endif %}
 {% trans 'Anreise des Kurs-/Tourenleiters am Vortag' %}: {% if event.arrival_previous_day %}{% trans 'Ja' %}{% else %}{% trans 'Nein' %}{% endif %}
 {% trans 'Veröffentlichung' %}: {% if planned_publication_date %}{{ planned_publication_date|date:'l, d. F Y' }}{% else %}{% trans 'sofort' %}{% endif %}
 {% if internal_note %}

dav_events/tests/test_emails.py

@@ -49,6 +49,7 @@ Link zur Veranstaltung:
  Veranstaltungsart: gemeinschaftliche Tour
  Schwierigkeitsnivau: Anfänger
  Gelände: Kletterhalle
+ Anmeldung: Nicht erforderlich
  Anreise des Kurs-/Tourenleiters am Vortag: Nein
  Veröffentlichung: sofort
  """