Merge branch 'cherry-pick-80f47938-2' into 'release/1.4'

[Release/1.4] Hotfix: The waiting list should only include non-cancels

See merge request !362

website/events/views.py

@@ -232,7 +232,9 @@ def registration(request, event_id, action=None):
             if (obj is not None and
                     obj.date_cancelled is None):
                 if (event.max_participants is not None and
-                        Registration.objects.filter(event=event).count() >=
+                        (Registration.objects
+                            .filter(event=event,
+                                    date_cancelled=None).count()) >=
                         event.max_participants):
                     # Prepare email to send to the first person on the waiting
                     # list