Commit 7b73f5a6 authored by chirac's avatar chirac

Merge branch 'hotfix-mail-field-in-user-forms' into 'dev'

Remet le field email dans UserForm et AdherentForm

See merge request federez/re2o!219
parents ee615ae1 1c75edb2
...@@ -220,7 +220,7 @@ class UserChangeForm(FormRevMixin, forms.ModelForm): ...@@ -220,7 +220,7 @@ class UserChangeForm(FormRevMixin, forms.ModelForm):
class Meta: class Meta:
model = Adherent model = Adherent
fields = ('pseudo', 'password', 'surname') fields = ('pseudo', 'password', 'surname', 'email')
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
prefix = kwargs.pop('prefix', self.Meta.model.__name__) prefix = kwargs.pop('prefix', self.Meta.model.__name__)
...@@ -313,6 +313,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): ...@@ -313,6 +313,7 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
'name', 'name',
'surname', 'surname',
'pseudo', 'pseudo',
'email',
'school', 'school',
'comment', 'comment',
'room', 'room',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment