diff --git a/kfet/forms.py b/kfet/forms.py index 0ec3b114..ad2814c9 100644 --- a/kfet/forms.py +++ b/kfet/forms.py @@ -83,7 +83,8 @@ class CofRestrictForm(CofForm): class UserForm(forms.ModelForm): def __init__(self, *args, **kwargs): - new_user = kwargs.get('instance') is None + from_clipper = kwargs.pop('from_clipper', False) + new_user = kwargs.get('instance') is None and not from_clipper super(UserForm, self).__init__(*args, **kwargs) if new_user: self.fields['username'].validators = [MinLengthValidator(9)] diff --git a/kfet/templates/kfet/account_create.html b/kfet/templates/kfet/account_create.html index 7d42b028..9da15755 100644 --- a/kfet/templates/kfet/account_create.html +++ b/kfet/templates/kfet/account_create.html @@ -14,11 +14,14 @@ {% include 'kfet/base_messages.html' %}
- {{ account_trigramme_form }} + {% csrf_token %} + {{ trigramme_form }}
-
+
+ {% include 'kfet/account_create_form.html' %} +