Projet

Général

Profil

0004-create-authentic2.forms-package-24439.patch

Benjamin Dauvergne, 20 juillet 2018 15:48

Télécharger (2,63 ko)

Voir les différences:

Subject: [PATCH 4/9] create authentic2.forms package (#24439)

 src/authentic2/{forms.py => forms/__init__.py} | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
 rename src/authentic2/{forms.py => forms/__init__.py} (95%)
src/authentic2/forms.py → src/authentic2/forms/__init__.py
8 8

  
9 9
from authentic2.compat import get_user_model
10 10

  
11
from . import models, app_settings
12
from .exponential_retry_timeout import ExponentialRetryTimeout
11
from .. import app_settings
12
from ..exponential_retry_timeout import ExponentialRetryTimeout
13 13

  
14 14

  
15 15
class EmailChangeFormNoPassword(forms.Form):
......
44 44
    next_url = forms.CharField(widget=forms.HiddenInput(), required=False)
45 45

  
46 46
    def __init__(self, *args, **kwargs):
47
        from .middleware import StoreRequestMiddleware
47
        from authentic2.middleware import StoreRequestMiddleware
48 48

  
49 49
        next_url = kwargs.pop('next_url', None)
50 50
        request = StoreRequestMiddleware.get_request()
......
61 61
    }
62 62

  
63 63
    def __init__(self, *args, **kwargs):
64
        from authentic2 import models
65

  
64 66
        self.attributes = models.Attribute.objects.all()
65 67
        initial = kwargs.setdefault('initial', {})
66 68
        if kwargs.get('instance'):
......
73 75
        super(BaseUserForm, self).__init__(*args, **kwargs)
74 76

  
75 77
    def clean(self):
78
        from authentic2 import models
79

  
76 80
        # make sure verified fields are not modified
77 81
        for av in models.AttributeValue.objects.with_owner(
78 82
                self.instance).filter(verified=True):
......
80 84
        super(BaseUserForm, self).clean()
81 85

  
82 86
    def save_attributes(self):
87
        from authentic2 import models
88

  
83 89
        verified_attributes = {}
84 90
        for av in models.AttributeValue.objects.with_owner(
85 91
                self.instance).filter(verified=True):
......
111 117

  
112 118
       For the user model also add attribute based fields.
113 119
    '''
120
    from authentic2 import models
121

  
114 122
    form = kwargs.pop('form', None)
115 123
    fields = kwargs.get('fields') or []
116 124
    required = list(kwargs.pop('required', []) or [])
117
-