diff --git a/src/members/forms.py b/src/members/forms.py index 9ac053db..8cf07b92 100644 --- a/src/members/forms.py +++ b/src/members/forms.py @@ -24,6 +24,11 @@ class MemberForm(forms.ModelForm): + section = forms.ModelChoiceField( + required=False, + queryset=Section.objects.order_by('abbreviation'), + label=_('Section'), + ) person_number = PersonNumberField( label=_('Person number'), help_text=_('Person number using the YYYYMMDD-XXXX format.'), @@ -81,6 +86,12 @@ def save(self, commit=True): class RegistrationForm(MemberForm, auth.UserCreationForm): + section = forms.ModelChoiceField( + required=False, + queryset=Section.objects.order_by('abbreviation'), + label=_('Section'), + ) + class Meta: model = Member fields = ['username', 'email', 'phone_number', 'section'] @@ -219,6 +230,12 @@ def password_enabled(self): widget=forms.PasswordInput, help_text=_("Enter the same password as above, for verification.")) + section = forms.ModelChoiceField( + required=False, + queryset=Section.objects.order_by('abbreviation'), + label=_('Section'), + ) + is_superuser = forms.BooleanField( label=_("Administrator"), required=False, help_text=_('Administrators have full access to manage any object ' @@ -307,6 +324,11 @@ def save(self, commit=True): class UserEditForm(UserForm): password_required = False + section = forms.ModelChoiceField( + required=False, + queryset=Section.objects.order_by('abbreviation'), + label=_('Section'), + ) def __init__(self, *args, **kwargs): kwargs.pop('editing_self', False) @@ -332,10 +354,9 @@ class CustomUserEditForm(UserEditForm): help_text=_('Person number using the YYYYMMDD-XXXX format.'), required=False ) - phone_number = forms.CharField( - required=True, - label=_('Phone number'), - ) + + phone_number = PhoneNumberField() + email = forms.EmailField( required=True, label=_('Email'), @@ -351,7 +372,7 @@ class CustomUserEditForm(UserEditForm): ) section = forms.ModelChoiceField( required=False, - queryset=Section.objects, + queryset=Section.objects.order_by('abbreviation'), label=_('Section'), ) status = forms.ChoiceField( @@ -400,10 +421,7 @@ class CustomUserCreationForm(UserCreationForm): required=True, label=_('Email'), ) - phone_number = forms.CharField( - required=True, - label=_('Phone number'), - ) + phone_number = PhoneNumberField() registration_year = forms.CharField( required=False, label=_('Registration year'), @@ -415,7 +433,7 @@ class CustomUserCreationForm(UserCreationForm): ) section = forms.ModelChoiceField( required=False, - queryset=Section.objects, + queryset=Section.objects.order_by('abbreviation'), label=_("Section"), )