From 9bbc9e934d5bd9d7d9de1442d70ef034aa6f4daa Mon Sep 17 00:00:00 2001 From: Ludovic Stephan Date: Wed, 21 Dec 2016 00:45:30 -0200 Subject: [PATCH] change soldTo functioning --- bda/forms.py | 5 ++--- bda/views.py | 5 +++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bda/forms.py b/bda/forms.py index fe20e565..352914e4 100644 --- a/bda/forms.py +++ b/bda/forms.py @@ -68,9 +68,8 @@ class AnnulForm(forms.Form): self.fields['attributions'].queryset = participant.attribution_set\ .filter(spectacle__date__gte=timezone.now(), revente__isnull=False, - revente__date__gt=timezone.now()-timedelta(hours=1))\ - .filter(Q(revente__soldTo__isnull=True) | - Q(revente__soldTo=participant)) + revente__date__gt=timezone.now()-timedelta(hours=1), + revente__soldTo__isnull=True) class InscriptionReventeForm(forms.Form): diff --git a/bda/views.py b/bda/views.py index 58c54a01..1ff2be41 100644 --- a/bda/views.py +++ b/bda/views.py @@ -285,6 +285,7 @@ def revente(request, tirage_id): if not created: revente.seller = participant revente.date = timezone.now() + revente.soldTo = None revente.notif_sent = False revente.tirage_done = False revente.shotgun = False @@ -337,6 +338,7 @@ def revente(request, tirage_id): revente.soldTo = None revente.notif_sent = False revente.tirage_done = False + revente.shotgun = False if revente.answered_mail: revente.answered_mail.clear() revente.save() @@ -357,8 +359,7 @@ def revente(request, tirage_id): sold = participant.attribution_set.filter( spectacle__date__gte=timezone.now(), revente__isnull=False, - revente__soldTo__isnull=False).exclude( - revente__soldTo=participant) + revente__soldTo__isnull=False) return render(request, "bda-revente.html", {'tirage': tirage, 'overdue': overdue, "sold": sold,