8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-10-31 23:22:49 +00:00

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

Remet le field email dans UserForm et AdherentForm

See merge request federez/re2o!219
This commit is contained in:
chirac 2018-08-05 22:57:24 +02:00
commit 7b73f5a63b

View file

@ -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):
'name', 'name',
'surname', 'surname',
'pseudo', 'pseudo',
'email',
'school', 'school',
'comment', 'comment',
'room', 'room',