From f14a99cb07eaa6bb09d08bcc226c0695f635cd09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Sun, 5 Jun 2016 16:00:46 +0200 Subject: [PATCH] Correction dans la vue `do_tirage` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit La graine du tirage est sauvegardée et on renomme la variable `tirage` pour lever l'ambiguïté avec la fonction `tirage`. --- bda/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bda/views.py b/bda/views.py index b370dd52..51fd2de6 100644 --- a/bda/views.py +++ b/bda/views.py @@ -162,15 +162,17 @@ def inscription(request, tirage_id): "stateerror": stateerror}) def do_tirage(request, tirage_id): - tirage = get_object_or_404(Tirage, id=tirage_id) + tirage_elt = get_object_or_404(Tirage, id=tirage_id) form = TokenForm(request.POST) if not form.is_valid(): return tirage(request) + tirage_elt.token = form.cleaned_data['token'] + tirage_elt.save() start = time.time() data = {} - shows = Spectacle.objects.filter(tirage=tirage).select_related().all() - members = Participant.objects.filter(tirage=tirage).all() - choices = ChoixSpectacle.objects.filter(spectacle__tirage=tirage).order_by( + shows = Spectacle.objects.filter(tirage=tirage_elt).select_related().all() + members = Participant.objects.filter(tirage=tirage_elt).all() + choices = ChoixSpectacle.objects.filter(spectacle__tirage=tirage_elt).order_by( 'participant', 'priority').select_related().all() algo = Algorithm(shows, members, choices) results = algo(form.cleaned_data["token"])