From eaf073d23284c5e6b96d5fd759950f611979e1d0 Mon Sep 17 00:00:00 2001 From: Andrew-Chen-Wang Date: Tue, 22 Nov 2022 14:58:55 -0500 Subject: [PATCH] Try linting again --- .../{{cookiecutter.project_slug}}/users/admin.py | 2 +- .../{{cookiecutter.project_slug}}/users/models.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py index 10fe4e709..233994bb0 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py @@ -37,7 +37,7 @@ class UserAdmin(auth_admin.UserAdmin): ) list_display = ["{{cookiecutter.username_type}}", "name", "is_superuser"] search_fields = ["name"] - {% if cookiecutter.username_type == "email" -%} + {%- if cookiecutter.username_type == "email" -%} ordering = ["id"] add_fieldsets = ( ( diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py index 32cc19ef7..c5d983b48 100644 --- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py +++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py @@ -4,11 +4,11 @@ from django.contrib.auth.models import AbstractUser, UserManager as DjangoUserMa {%- else %} from django.contrib.auth.models import AbstractUser {%- endif %} -from django.db.models import CharField, EmailField +from django.db.models import CharField{%- if cookiecutter.username_type == "email" %}, EmailField{% endif %} from django.urls import reverse from django.utils.translation import gettext_lazy as _ -{% if cookiecutter.username_type == "email" -%} +{%- if cookiecutter.username_type == "email" -%} class UserManager(DjangoUserManager): def _create_user(self, email, password, **extra_fields): """ @@ -49,7 +49,7 @@ class User(AbstractUser): #: First and last name do not cover name patterns around the globe name = CharField(_("Name of User"), blank=True, max_length=255) - {% if cookiecutter.username_type == "email" -%} + {%- if cookiecutter.username_type == "email" -%} username = None # type: ignore email = EmailField(_("email address"), unique=True) {%- endif %}