Fixes last_submission property

OneGov · Mar 28, 2018 · 72c005f · 72c005f
1 parent 1d9f286
commit 72c005f
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/onegov/form/models/registration_window.py b/onegov/form/models/registration_window.py
@@ -4,6 +4,7 @@
 from onegov.core.orm.mixins import TimestampMixin
 from onegov.core.orm.types import UUID
 from onegov.form.models.submission import FormSubmission
+from sqlalchemy import and_
 from sqlalchemy import Boolean
 from sqlalchemy import Column
 from sqlalchemy import Date
@@ -175,10 +176,12 @@ def next_submission(self):
         q = object_session(self).query(FormSubmission)
         q = q.filter(FormSubmission.registration_window_id == self.id)
         q = q.filter(FormSubmission.state == 'complete')
-        q = q.filter(FormSubmission.claimed != 0)
         q = q.filter(or_(
             FormSubmission.claimed == None,
-            FormSubmission.claimed < FormSubmission.spots,
+            and_(
+                FormSubmission.claimed > 0,
+                FormSubmission.claimed < FormSubmission.spots,
+            )
         ))
         q = q.order_by(FormSubmission.created)