Commit 30bf8f81 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'fix/events-late-max-participants' into 'master'

Fix problem with late cancellation when events has no 'max participants' number

See merge request !355
parents 7f1427a0 94b8efdd
......@@ -324,17 +324,19 @@ class Registration(models.Model):
def is_late_cancellation(self):
# First check whether or not the user cancelled
# If the user cancelled then check if this was after the deadline
# And do a complex check to calculate if this user was on
# And if there is a max participants number:
# do a complex check to calculate if this user was on
# the waiting list at the time of cancellation, since
# you shouldn't need to pay the costs of something
# you weren't even able to go to.
return (self.date_cancelled and
self.date_cancelled > self.event.cancel_deadline and
self.event.registration_set.filter(
(self.event.max_participants is None or
self.event.registration_set.filter(
(Q(date_cancelled__gte=self.date_cancelled) |
Q(date_cancelled=None)) &
Q(date__lte=self.date)
).count() < self.event.max_participants)
).count() < self.event.max_participants))
def is_registered(self):
return self.date_cancelled is None
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment