Merge branch 'cherry-pick-ee395fe0' into 'release/1.16'

Merge branch 'fix/registrations-form-entry-missing' into 'master'

See merge request !883

website/registrations/forms.py

@@ -35,7 +35,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):

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):

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()