diff --git a/website/registrations/forms.py b/website/registrations/forms.py index eeb8b1ef74ce56b2811c6ba72eac37447c50ee09..8ef50d5248e35d48b090c304768f4023d0ddf576 100644 --- a/website/registrations/forms.py +++ b/website/registrations/forms.py @@ -23,7 +23,8 @@ class MemberRegistrationForm(forms.ModelForm): class Meta: model = Registration fields = '__all__' - exclude = ['created_at', 'updated_at', 'status', 'username', 'remarks'] + exclude = ['created_at', 'updated_at', 'status', 'username', 'remarks', + 'payment', 'membership'] class MemberRenewalForm(forms.ModelForm): diff --git a/website/registrations/models.py b/website/registrations/models.py index 1672eb540e3ecf7fffa3dee3e06be5c43f8a50ae..aa778f39bbfc1e3045b6dc4e4267be996b5bdb8a 100644 --- a/website/registrations/models.py +++ b/website/registrations/models.py @@ -271,7 +271,7 @@ class Registration(Entry): if (self.starting_year is None and self.membership_type is not Membership.SUPPORTER): errors.update({ - 'username': _('This field is required.')}) + 'starting_year': _('This field is required.')}) if (self.programme is None and self.membership_type is not Membership.SUPPORTER): diff --git a/website/registrations/tests/test_models.py b/website/registrations/tests/test_models.py index 3a37259df2191808e0808e56108fd188230fb8ac..10db8de2f213094351baac34aae441d49de6a1fc 100644 --- a/website/registrations/tests/test_models.py +++ b/website/registrations/tests/test_models.py @@ -129,14 +129,20 @@ class RegistrationTest(TestCase): def test_require_programme_members(self): self.registration.programme = None - with self.assertRaises(ValidationError): + with self.assertRaisesMessage( + ValidationError, + "{'programme': ['Dit veld is vereist.']}" + ): self.registration.clean() self.registration.membership_type = Membership.SUPPORTER self.registration.clean() def test_require_starting_year_members(self): self.registration.starting_year = None - with self.assertRaises(ValidationError): + with self.assertRaisesMessage( + ValidationError, + "{'starting_year': ['Dit veld is vereist.']}" + ): self.registration.clean() self.registration.membership_type = Membership.SUPPORTER self.registration.clean()