cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-15 01:14:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add conditions for fields in UserAdminCreationForm

Browse Source
This commit is contained in:
Bruno Alla 2023-04-04 22:39:33 +01:00
parent 8c8c9f52d1
commit 466a9d3c24
No known key found for this signature in database
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
View File

@ -2,7 +2,10 @@ from allauth.account.forms import SignupForm
from allauth.socialaccount.forms import SignupForm as SocialSignupForm
from django.contrib.auth import forms as admin_forms
from django.contrib.auth import get_user_model
{%- if cookiecutter.username_type == "email" %}
from django.forms import EmailField
{%- endif %}
from django.utils.translation import gettext_lazy as _
User = get_user_model()
@ -10,7 +13,9 @@ User = get_user_model()
class UserAdminChangeForm(admin_forms.UserChangeForm):
class Meta(admin_forms.UserChangeForm.Meta):
model = User
{%- if cookiecutter.username_type == "email" %}
field_classes = {"email": EmailField}
{%- endif %}
class UserAdminCreationForm(admin_forms.UserCreationForm):
@ -21,8 +26,17 @@ class UserAdminCreationForm(admin_forms.UserCreationForm):
class Meta(admin_forms.UserCreationForm.Meta):
model = User
{%- if cookiecutter.username_type == "email" %}
fields = ("email",)
field_classes = {"email": EmailField}
error_messages = {
"username": {"unique": _("This email has already been taken.")}
}
{%- else %}
error_messages = {
"username": {"unique": _("This username has already been taken.")}
}
{%- endif %}
class UserSignupForm(SignupForm):

4
{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
View File

@ -24,7 +24,7 @@ class TestUserAdminCreationForm:
# hence cannot be created.
form = UserAdminCreationForm(
{
{%- if cookiecutter.username_type == "email" -%}
{%- if cookiecutter.username_type == "email" %}
"email": user.email,
{%- else %}
"username": user.username,
@ -36,7 +36,7 @@ class TestUserAdminCreationForm:
assert not form.is_valid()
assert len(form.errors) == 1
{%- if cookiecutter.username_type == "email" -%}
{%- if cookiecutter.username_type == "email" %}
assert "email" in form.errors
assert form.errors["email"][0] == _("This email has already been taken.")
{%- else %}