From 8b3c3ffe7e34011bdc6a3012c0144ee50a89025d Mon Sep 17 00:00:00 2001 From: Dorian Lesbre <dorian.lesbre@gmail.com> Date: Sun, 7 Mar 2021 16:16:12 +0100 Subject: [PATCH] Fix suscribing to unsubscribable activities --- home/forms.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/home/forms.py b/home/forms.py index a0ba31c..26b1f01 100644 --- a/home/forms.py +++ b/home/forms.py @@ -1,7 +1,7 @@ from django import forms from django.core.exceptions import ValidationError -from home.models import ActivityList, InterludesParticipant +from home.models import ActivityList, InterludesParticipant, InterludesActivity from shared.forms import FormRenderMixin @@ -31,6 +31,12 @@ class ActivityForm(FormRenderMixin, forms.ModelForm): class Meta: model = ActivityList fields = ("activity",) + #widgets = {"activity": forms.Select(choices=())} + + def __init__(self, *args, **kwargs): + super(ActivityForm, self).__init__(*args, **kwargs) + activities = InterludesActivity.objects.filter(display=True, must_subscribe=True) + self.fields['activity'].queryset = activities class BaseActivityFormSet(forms.BaseFormSet): """Form set that fails if duplicate activities""" @@ -47,6 +53,5 @@ class BaseActivityFormSet(forms.BaseFormSet): if activity is None: continue if activity in activities: - print(activity) raise ValidationError("Vous ne pouvez pas sélectionner une même activtté plusieurs fois") activities.append(activity) -- GitLab