Lint fix v1
This commit is contained in:
@@ -5,12 +5,12 @@ from .models import User
|
||||
|
||||
@admin.register(User)
|
||||
class UserAdmin(admin.ModelAdmin):
|
||||
search_fields = ("id", "email", "first_name", "last_name")
|
||||
search_fields = ('id', 'email', 'first_name', 'last_name')
|
||||
list_display = (
|
||||
"id",
|
||||
"first_name",
|
||||
"last_name",
|
||||
"is_active",
|
||||
"email",
|
||||
"date_joined",
|
||||
'id',
|
||||
'first_name',
|
||||
'last_name',
|
||||
'is_active',
|
||||
'email',
|
||||
'date_joined',
|
||||
)
|
||||
|
||||
@@ -2,4 +2,4 @@ from django.apps import AppConfig
|
||||
|
||||
|
||||
class CoreConfig(AppConfig):
|
||||
name = "core"
|
||||
name = 'core'
|
||||
|
||||
@@ -9,7 +9,7 @@ class UserManager(BaseUserManager):
|
||||
Creates and saves a User with the given email and password.
|
||||
"""
|
||||
if not email:
|
||||
raise ValueError("The given email must be set")
|
||||
raise ValueError('The given email must be set')
|
||||
email = self.normalize_email(email)
|
||||
user = self.model(email=email, **extra_fields)
|
||||
user.set_password(password)
|
||||
@@ -17,13 +17,13 @@ class UserManager(BaseUserManager):
|
||||
return user
|
||||
|
||||
def create_user(self, email, password=None, **extra_fields):
|
||||
extra_fields.setdefault("is_superuser", False)
|
||||
extra_fields.setdefault('is_superuser', False)
|
||||
return self._create_user(email, password, **extra_fields)
|
||||
|
||||
def create_superuser(self, email, password, **extra_fields):
|
||||
extra_fields.setdefault("is_superuser", True)
|
||||
extra_fields.setdefault('is_superuser', True)
|
||||
|
||||
if extra_fields.get("is_superuser") is not True:
|
||||
raise ValueError("Superuser must have is_superuser=True.")
|
||||
if extra_fields.get('is_superuser') is not True:
|
||||
raise ValueError('Superuser must have is_superuser=True.')
|
||||
|
||||
return self._create_user(email, password, **extra_fields)
|
||||
|
||||
@@ -1,98 +1,89 @@
|
||||
# Generated by Django 3.1.3 on 2020-11-05 00:51
|
||||
|
||||
import core.managers
|
||||
from django.db import migrations, models
|
||||
|
||||
import core.managers
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
initial = True
|
||||
|
||||
dependencies = [
|
||||
("auth", "0012_alter_user_first_name_max_length"),
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name="User",
|
||||
name='User',
|
||||
fields=[
|
||||
(
|
||||
"id",
|
||||
'id',
|
||||
models.AutoField(
|
||||
auto_created=True,
|
||||
primary_key=True,
|
||||
serialize=False,
|
||||
verbose_name="ID",
|
||||
verbose_name='ID',
|
||||
),
|
||||
),
|
||||
("password", models.CharField(max_length=128, verbose_name="password")),
|
||||
('password', models.CharField(max_length=128, verbose_name='password')),
|
||||
(
|
||||
"last_login",
|
||||
models.DateTimeField(
|
||||
blank=True, null=True, verbose_name="last login"
|
||||
),
|
||||
'last_login',
|
||||
models.DateTimeField(blank=True, null=True, verbose_name='last login'),
|
||||
),
|
||||
(
|
||||
"email",
|
||||
models.EmailField(
|
||||
max_length=254, unique=True, verbose_name="E-mail"
|
||||
),
|
||||
'email',
|
||||
models.EmailField(max_length=254, unique=True, verbose_name='E-mail'),
|
||||
),
|
||||
(
|
||||
"first_name",
|
||||
models.CharField(
|
||||
blank=True, max_length=30, verbose_name="First name"
|
||||
),
|
||||
'first_name',
|
||||
models.CharField(blank=True, max_length=30, verbose_name='First name'),
|
||||
),
|
||||
(
|
||||
"last_name",
|
||||
models.CharField(
|
||||
blank=True, max_length=30, verbose_name="Last name"
|
||||
),
|
||||
'last_name',
|
||||
models.CharField(blank=True, max_length=30, verbose_name='Last name'),
|
||||
),
|
||||
(
|
||||
"date_joined",
|
||||
models.DateTimeField(auto_now_add=True, verbose_name="date joined"),
|
||||
'date_joined',
|
||||
models.DateTimeField(auto_now_add=True, verbose_name='date joined'),
|
||||
),
|
||||
(
|
||||
"is_active",
|
||||
models.BooleanField(default=True, verbose_name="User active?"),
|
||||
'is_active',
|
||||
models.BooleanField(default=True, verbose_name='User active?'),
|
||||
),
|
||||
("is_staff", models.BooleanField(default=False, verbose_name="Staff?")),
|
||||
('is_staff', models.BooleanField(default=False, verbose_name='Staff?')),
|
||||
(
|
||||
"is_superuser",
|
||||
models.BooleanField(default=False, verbose_name="Superuser?"),
|
||||
'is_superuser',
|
||||
models.BooleanField(default=False, verbose_name='Superuser?'),
|
||||
),
|
||||
(
|
||||
"groups",
|
||||
'groups',
|
||||
models.ManyToManyField(
|
||||
blank=True,
|
||||
help_text="The groups this user belongs to. A"
|
||||
"user will get all permissions granted to each of their groups.",
|
||||
related_name="user_set",
|
||||
related_query_name="user",
|
||||
to="auth.Group",
|
||||
verbose_name="groups",
|
||||
help_text='The groups this user belongs to. Auser will get all permissions granted to each of their groups.',
|
||||
related_name='user_set',
|
||||
related_query_name='user',
|
||||
to='auth.Group',
|
||||
verbose_name='groups',
|
||||
),
|
||||
),
|
||||
(
|
||||
"user_permissions",
|
||||
'user_permissions',
|
||||
models.ManyToManyField(
|
||||
blank=True,
|
||||
help_text="Specific permissions for this user.",
|
||||
related_name="user_set",
|
||||
related_query_name="user",
|
||||
to="auth.Permission",
|
||||
verbose_name="user permissions",
|
||||
help_text='Specific permissions for this user.',
|
||||
related_name='user_set',
|
||||
related_query_name='user',
|
||||
to='auth.Permission',
|
||||
verbose_name='user permissions',
|
||||
),
|
||||
),
|
||||
],
|
||||
options={
|
||||
"verbose_name": "User",
|
||||
"verbose_name_plural": "Users",
|
||||
"db_table": "users",
|
||||
"ordering": ["first_name", "last_name"],
|
||||
'verbose_name': 'User',
|
||||
'verbose_name_plural': 'Users',
|
||||
'db_table': 'users',
|
||||
'ordering': ['first_name', 'last_name'],
|
||||
},
|
||||
managers=[("objects", core.managers.UserManager())],
|
||||
managers=[('objects', core.managers.UserManager())],
|
||||
),
|
||||
]
|
||||
|
||||
@@ -4,24 +4,22 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("auth", "0012_alter_user_first_name_max_length"),
|
||||
("core", "0001_initial"),
|
||||
('auth', '0012_alter_user_first_name_max_length'),
|
||||
('core', '0001_initial'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="groups",
|
||||
model_name='user',
|
||||
name='groups',
|
||||
field=models.ManyToManyField(
|
||||
blank=True,
|
||||
help_text="The groups this user belongs to. "
|
||||
"A user will get all permissions granted to each of their groups.",
|
||||
related_name="user_set",
|
||||
related_query_name="user",
|
||||
to="auth.Group",
|
||||
verbose_name="groups",
|
||||
help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.',
|
||||
related_name='user_set',
|
||||
related_query_name='user',
|
||||
to='auth.Group',
|
||||
verbose_name='groups',
|
||||
),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -4,15 +4,14 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("core", "0002_auto_20201105_0303"),
|
||||
('core', '0002_auto_20201105_0303'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="is_staff",
|
||||
field=models.BooleanField(default=True, verbose_name="Staff?"),
|
||||
model_name='user',
|
||||
name='is_staff',
|
||||
field=models.BooleanField(default=True, verbose_name='Staff?'),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -4,17 +4,14 @@ from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("core", "0003_auto_20201106_0152"),
|
||||
('core', '0003_auto_20201106_0152'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name="user",
|
||||
name="id",
|
||||
field=models.BigAutoField(
|
||||
auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
|
||||
),
|
||||
model_name='user',
|
||||
name='id',
|
||||
field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
|
||||
),
|
||||
]
|
||||
|
||||
@@ -1,41 +1,41 @@
|
||||
from django.db import models
|
||||
from django.contrib.auth.models import PermissionsMixin
|
||||
from django.contrib.auth.base_user import AbstractBaseUser
|
||||
from django.contrib.auth.models import PermissionsMixin
|
||||
from django.db import models
|
||||
|
||||
from .managers import UserManager
|
||||
|
||||
|
||||
class User(AbstractBaseUser, PermissionsMixin):
|
||||
email = models.EmailField("E-mail", unique=True)
|
||||
email = models.EmailField('E-mail', unique=True)
|
||||
|
||||
first_name = models.CharField("First name", max_length=30, blank=True)
|
||||
last_name = models.CharField("Last name", max_length=30, blank=True)
|
||||
first_name = models.CharField('First name', max_length=30, blank=True)
|
||||
last_name = models.CharField('Last name', max_length=30, blank=True)
|
||||
|
||||
date_joined = models.DateTimeField("date joined", auto_now_add=True)
|
||||
date_joined = models.DateTimeField('date joined', auto_now_add=True)
|
||||
|
||||
is_active = models.BooleanField("User active?", default=True)
|
||||
is_staff = models.BooleanField("Staff?", default=True)
|
||||
is_superuser = models.BooleanField("Superuser?", default=False)
|
||||
is_active = models.BooleanField('User active?', default=True)
|
||||
is_staff = models.BooleanField('Staff?', default=True)
|
||||
is_superuser = models.BooleanField('Superuser?', default=False)
|
||||
|
||||
objects = UserManager()
|
||||
|
||||
USERNAME_FIELD = "email"
|
||||
USERNAME_FIELD = 'email'
|
||||
|
||||
class Meta:
|
||||
ordering = ["first_name", "last_name"]
|
||||
verbose_name = "User"
|
||||
verbose_name_plural = "Users"
|
||||
db_table = "users"
|
||||
ordering = ['first_name', 'last_name']
|
||||
verbose_name = 'User'
|
||||
verbose_name_plural = 'Users'
|
||||
db_table = 'users'
|
||||
|
||||
def get_full_name(self):
|
||||
"""
|
||||
Returns the first_name plus the last_name, with a space in between.
|
||||
"""
|
||||
full_name = f"{self.first_name} {self.last_name}"
|
||||
full_name = f'{self.first_name} {self.last_name}'
|
||||
return full_name.strip()
|
||||
|
||||
def get_short_name(self):
|
||||
"""
|
||||
Returns the short name for the user.
|
||||
"""
|
||||
return self.first_name or "Unamed"
|
||||
return self.first_name or 'Unamed'
|
||||
|
||||
Reference in New Issue
Block a user