diff --git a/src/members/forms.py b/src/members/forms.py index c646232e..c6419f0d 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'] @@ -216,6 +227,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 ' @@ -304,6 +321,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) diff --git a/src/members/urls.py b/src/members/urls.py index 2f9402d7..3f266a08 100644 --- a/src/members/urls.py +++ b/src/members/urls.py @@ -3,7 +3,7 @@ from django.views.generic import CreateView from members import views -from members.forms import CustomUserCreationForm +from members.forms import RegistrationForm urlpatterns = [ re_path(r'^profile/$', views.ProfileView.as_view(), name='profile'), @@ -14,7 +14,7 @@ ), re_path('^register/', CreateView.as_view( template_name='members/register.html', - form_class=CustomUserCreationForm, + form_class=RegistrationForm, success_url=reverse_lazy('login'), ), name='register'),