diff --git a/scipost_django/colleges/forms.py b/scipost_django/colleges/forms.py index cbe62e42406e6bb06ee9dec2b0d4c0868e42ec92..9609efdca09bdee6625ba2d4996b11a628ce681f 100644 --- a/scipost_django/colleges/forms.py +++ b/scipost_django/colleges/forms.py @@ -574,17 +574,9 @@ class FellowshipNominationForm(forms.ModelForm): class FellowshipNominationSearchForm(forms.Form): - all_nominations = FellowshipNomination.objects.all() - nomination_colleges = all_nominations.values_list("college", flat=True).distinct() - nominee = forms.CharField(max_length=100, required=False, label="Nominee") - college = forms.MultipleChoiceField( - choices=College.objects.filter(id__in=nomination_colleges) - .order_by("name") - .values_list("id", "name"), - required=False, - ) + college = forms.MultipleChoiceField(required=False) decision = forms.ChoiceField( choices=[("", "Any"), ("pending", "Pending")] @@ -649,6 +641,13 @@ class FellowshipNominationSearchForm(forms.Form): self.session_key = kwargs.pop("session_key", None) super().__init__(*args, **kwargs) + self.fields["college"].choices = ( + FellowshipNomination.objects.all() + .values_list("college__id", "college__name") + .order_by("college__name") + .distinct() + ) + # Set the initial values of the form fields from the session data if self.session_key: session = SessionStore(session_key=self.session_key)