entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 35 Releases Activity

forms: allow ordering of fields on profile page

This commit is contained in:
Benjamin Dauvergne 2014-07-08 10:13:43 +02:00
parent 56592e6ac3
commit 02f3a2bae8
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
authentic2/app_settings.py
View File

@ -105,6 +105,7 @@ default_settings = dict(
A2_REGISTRATION_FORM_USERNAME_LABEL=Setting(default=_('Username')),
A2_REGISTRATION_REALM=Setting(default=None, definition='Default realm to assign to self-registrated users'),
A2_REGISTRATION_GROUPS=Setting(default=[], definition='Default groups for self-registered users'),
A2_PROFILE_FIELDS=Setting(default=[], definition='Fields to show to the user in the profile page'),
A2_REGISTRATION_FIELDS=Setting(default=[], definition='Fields from the user model that must appear on the registration form'),
A2_REGISTRATION_REQUIRED_FIELDS=Setting(default=[], definition='Fields from the registration form that must be required'),
A2_REALMS=Setting(default=[], definition='List of realms to search user accounts'),

13
authentic2/forms.py
View File

@ -2,10 +2,11 @@ from django import forms
from django.contrib.auth import models as auth_models
from django.contrib.contenttypes.models import ContentType
from django.utils.translation import ugettext_lazy as _
from django.utils.datastructures import SortedDict
from authentic2.compat import get_user_model
from . import models
from . import models, app_settings
auth_models.User.USER_PROFILE = ('first_name', 'last_name', 'email')
User = get_user_model()
@ -58,6 +59,16 @@ class UserProfileForm(UserAttributeFormMixin, forms.ModelForm):
for field in get_user_model().REQUIRED_FIELDS:
if field in self.fields:
self.fields[field].required = True
ordered_fields = app_settings.A2_PROFILE_FIELDS or app_settings.A2_REGISTRATION_FIELDS
if ordered_fields:
new_fields = SortedDict()
for field_name in ordered_fields:
if field_name in self.fields:
new_fields[field_name] = self.fields[field_name]
for field_name in self.fields:
if field_name not in new_fields:
new_fields[field_name] = self.fields[field_name]
self.fields = new_fields
def get_attributes(self):
qs = super(UserProfileForm, self).get_attributes()