remove captcha field

remotes/origin/HEAD
Max Yakovenko 8 years ago
parent 54f2bb5a6e
commit 59cb0d9e7a
  1. 22
      accounts_ext/forms.py

@ -1,11 +1,9 @@
import logging import logging
from captcha.fields import CaptchaField
from crispy_forms.helper import FormHelper from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Field, Div, Submit, HTML from crispy_forms.layout import Layout, Field, Div, Submit, HTML
from django import forms from django import forms
from django.conf import settings from django.conf import settings
from django.contrib.auth import get_user_model, password_validation from django.contrib.auth import get_user_model, password_validation
from django.forms import ALL_FIELDS
from django.urls import reverse, reverse_lazy from django.urls import reverse, reverse_lazy
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django_email_blacklist import DisposableEmailChecker from django_email_blacklist import DisposableEmailChecker
@ -18,18 +16,11 @@ from django.contrib.auth.forms import (
UserCreationForm as UserCreationFormBase UserCreationForm as UserCreationFormBase
) )
from django.contrib.auth.forms import UsernameField from django.contrib.auth.forms import UsernameField
from core.models import STATUS_ACTIVE, STATUS_CHOICES from core.models import STATUS_ACTIVE
from .models import User, Profile, Company from .models import Profile, Company
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
# class PickUpPointsForm(layout.ModelForm):
# class Meta:'
# model = PickUpRequest
# fields = ('requisites',)
class RegistrationForm(RegistrationFormUniqueEmail): class RegistrationForm(RegistrationFormUniqueEmail):
email = forms.EmailField(label=_("E-mail"), widget=forms.EmailInput(attrs={'class': 'reg__text'})) email = forms.EmailField(label=_("E-mail"), widget=forms.EmailInput(attrs={'class': 'reg__text'}))
password1 = forms.CharField( password1 = forms.CharField(
@ -51,9 +42,6 @@ class RegistrationForm(RegistrationFormUniqueEmail):
widget=forms.TextInput(attrs={'class': 'reg__text'})) widget=forms.TextInput(attrs={'class': 'reg__text'}))
agreement = forms.BooleanField() agreement = forms.BooleanField()
# captcha = CaptchaField(required=not settings.DEBUG)
captcha = CaptchaField(required=not settings.DEBUG)
title = _('Регистрация') title = _('Регистрация')
def clean_email(self): def clean_email(self):
@ -76,7 +64,7 @@ class RegistrationForm(RegistrationFormUniqueEmail):
return user return user
class Meta: class Meta:
model = User model = get_user_model()
fields = ('username', 'email',) fields = ('username', 'email',)
labels = { labels = {
'username': _('Логин'), 'username': _('Логин'),
@ -269,7 +257,7 @@ class UserChangeForm(UserChangeFormBase):
class Meta: class Meta:
model = get_user_model() model = get_user_model()
fields = ('status',) fields = ('status','referral_code',)
class UserCreationForm(UserCreationFormBase): class UserCreationForm(UserCreationFormBase):
@ -282,7 +270,7 @@ class UserCreationForm(UserCreationFormBase):
class Meta: class Meta:
model = get_user_model() model = get_user_model()
fields = ('email', 'username', 'status', 'is_superuser') fields = ('email', 'username', 'status', 'referral_code', 'is_superuser')
field_classes = { field_classes = {
'email': forms.EmailField, 'email': forms.EmailField,
'username': UsernameField, 'username': UsernameField,

Loading…
Cancel
Save