Merge branch 'fix/events-participants-queue' into 'master'

Fix events table values in admin

See merge request !598

website/events/locale/nl/LC_MESSAGES/django.po

@@ -301,7 +301,7 @@ msgstr "Niet betaald"
 
 #: models.py:266
 msgid "Paid with cash"
-msgstr "Contact betaald"
+msgstr "Contant betaald"
 
 #: models.py:267
 msgid "Paid with card"
@@ -504,7 +504,7 @@ msgstr "niet betaald"
 
 #: templates/events/admin/registrations_table.html:13
 msgid "paid cash"
-msgstr "contact betaald"
+msgstr "contant betaald"
 
 #: templates/events/admin/registrations_table.html:14
 msgid "paid card"

website/events/models.py

@@ -161,11 +161,15 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
 
     @property
     def participants(self):
-        return self.registrations.order_by('date')[:self.max_participants]
+        if self.max_participants is not None:
+            return self.registrations.order_by('date')[:self.max_participants]
+        return self.registrations.order_by('date')
 
     @property
     def queue(self):
-        return self.registrations.order_by('date')[self.max_participants:]
+        if self.max_participants is not None:
+            return self.registrations.order_by('date')[self.max_participants:]
+        return []
 
     @property
     def cancellations(self):

website/events/templates/events/admin/details.html

@@ -35,9 +35,9 @@
     <div class="module">
         {% with event.registrationinformationfield_set.all as fields %}
         <h2>{% trans "registrations"|capfirst %}</h2>
-        {% include 'events/admin/registrations_table.html' with registrations=event.registrations %}
+        {% include 'events/admin/registrations_table.html' with registrations=event.participants %}
         <br>
-        {% if waiting %}
+        {% if event.queue.count > 0 %}
         <h2>{% trans "waiting"|capfirst %}</h2>
         {% trans "queued" as queued %}
         {% include 'events/admin/registrations_table.html' with registrations=event.queue verb=queued addlink=False %}
@@ -87,7 +87,7 @@
             {% endif %}
             <dt>{% trans "number of registrations"|capfirst %}</dt>
             <dd>
-                {% blocktrans count counter=registrations|length trimmed %}
+                {% blocktrans count counter=event.registrations|length trimmed %}
                     {{ counter }} registration
                 {% plural %}
                     {{ counter }} registrations