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

create authentic2.forms package (#24439)

This commit is contained in:
Benjamin Dauvergne 2018-07-20 17:02:42 +02:00
parent e32621c1c7
commit 4663e217ab
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/authentic2/forms.py → src/authentic2/forms/__init__.py
View File

@ -8,8 +8,8 @@ from django.utils import html
from authentic2.compat import get_user_model from authentic2.compat import get_user_model
from . import models, app_settings from .. import app_settings
from .exponential_retry_timeout import ExponentialRetryTimeout from ..exponential_retry_timeout import ExponentialRetryTimeout
class EmailChangeFormNoPassword(forms.Form): class EmailChangeFormNoPassword(forms.Form):
@ -44,7 +44,7 @@ class NextUrlFormMixin(forms.Form):
next_url = forms.CharField(widget=forms.HiddenInput(), required=False) next_url = forms.CharField(widget=forms.HiddenInput(), required=False)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
from .middleware import StoreRequestMiddleware from authentic2.middleware import StoreRequestMiddleware
next_url = kwargs.pop('next_url', None) next_url = kwargs.pop('next_url', None)
request = StoreRequestMiddleware.get_request() request = StoreRequestMiddleware.get_request()
@ -61,6 +61,8 @@ class BaseUserForm(forms.ModelForm):
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
from authentic2 import models
self.attributes = models.Attribute.objects.all() self.attributes = models.Attribute.objects.all()
initial = kwargs.setdefault('initial', {}) initial = kwargs.setdefault('initial', {})
if kwargs.get('instance'): if kwargs.get('instance'):
@ -73,6 +75,8 @@ class BaseUserForm(forms.ModelForm):
super(BaseUserForm, self).__init__(*args, **kwargs) super(BaseUserForm, self).__init__(*args, **kwargs)
def clean(self): def clean(self):
from authentic2 import models
# make sure verified fields are not modified # make sure verified fields are not modified
for av in models.AttributeValue.objects.with_owner( for av in models.AttributeValue.objects.with_owner(
self.instance).filter(verified=True): self.instance).filter(verified=True):
@ -80,6 +84,8 @@ class BaseUserForm(forms.ModelForm):
super(BaseUserForm, self).clean() super(BaseUserForm, self).clean()
def save_attributes(self): def save_attributes(self):
from authentic2 import models
verified_attributes = {} verified_attributes = {}
for av in models.AttributeValue.objects.with_owner( for av in models.AttributeValue.objects.with_owner(
self.instance).filter(verified=True): self.instance).filter(verified=True):
@ -111,6 +117,8 @@ def modelform_factory(model, **kwargs):
For the user model also add attribute based fields. For the user model also add attribute based fields.
''' '''
from authentic2 import models
form = kwargs.pop('form', None) form = kwargs.pop('form', None)
fields = kwargs.get('fields') or [] fields = kwargs.get('fields') or []
required = list(kwargs.pop('required', []) or []) required = list(kwargs.pop('required', []) or [])