models

2025-05-18 21:29:04 +03:00
parent 63228923a7
commit d70c5f73f5
50 changed files with 1344 additions and 52 deletions
--- a/users/admin.py
+++ b/users/admin.py
@@ -1,3 +1,85 @@
+from django import forms
 from django.contrib import admin
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
+from django.utils.translation import gettext_lazy as _

-# Register your models here.
+from .models import Account, Role
+
+
+class AccountChangeForm(forms.ModelForm):
+    password = forms.CharField(
+        label=_("Password"),
+        widget=forms.PasswordInput,
+        required=False,
+        help_text=_("Raw passwords are not stored, so there is no way to see this user's password.")
+    )
+
+    class Meta:
+        model = Account
+        fields = '__all__'
+
+    def save(self, commit=True):
+        password = self.cleaned_data.get('password')
+        if password:
+            self.instance.set_password(password)
+        return super().save(commit=commit)
+
+
+class AccountCreationForm(forms.ModelForm):
+    password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
+    password2 = forms.CharField(label=_("Password confirmation"), widget=forms.PasswordInput)
+
+    class Meta:
+        model = Account
+        fields = ('login',)
+
+    def clean_password2(self):
+        password1 = self.cleaned_data.get("password1")
+        password2 = self.cleaned_data.get("password2")
+        if password1 and password2 and password1 != password2:
+            raise forms.ValidationError(_("Passwords don't match"))
+        return password2
+
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        user.set_password(self.cleaned_data["password1"])
+        if commit:
+            user.save()
+        return user
+
+
+@admin.register(Account)
+class AccountAdmin(BaseUserAdmin):
+    form = AccountChangeForm
+    add_form = AccountCreationForm
+
+    list_display = ('login', 'full_name', 'role', 'is_staff', 'is_active')
+    list_filter = ('is_staff', 'is_active', 'role')
+    search_fields = ('login', 'first_name', 'last_name', 'middle_name', 'phone', 'email')
+    ordering = ('login',)
+    filter_horizontal = ('groups', 'user_permissions')
+
+    fieldsets = (
+        (None, {'fields': ('login', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'middle_name', 'phone', 'email')}),
+        (_('Permissions'), {
+            'fields': ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions'),
+        }),
+        (_('Role'), {'fields': ('role',)}),
+    )
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('login', 'password1', 'password2'),
+        }),
+    )
+
+    @admin.display(description=_('Full name'))
+    def full_name(self, obj):
+        return str(obj)
+
+
+@admin.register(Role)
+class RoleAdmin(admin.ModelAdmin):
+    list_display = ('name',)
+    search_fields = ('name',)
--- a/users/apps.py
+++ b/users/apps.py
@@ -4,3 +4,4 @@ from django.apps import AppConfig
 class UsersConfig(AppConfig):
    default_auto_field = 'django.db.models.BigAutoField'
    name = 'users'
+    verbose_name = "Пользователи"
--- a/users/migrations/0001_initial.py
+++ b/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.21 on 2025-05-14 16:31
+# Generated by Django 4.2.21 on 2025-05-18 18:21

 from django.db import migrations, models
 import django.db.models.deletion
@@ -17,35 +17,35 @@ class Migration(migrations.Migration):
            name='Role',
            fields=[
                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=20, unique=True, verbose_name='Название роли')),
+                ('name', models.CharField(max_length=100, verbose_name='Название роли')),
            ],
            options={
-                'verbose_name': 'Роль',
-                'verbose_name_plural': 'Роли',
+                'verbose_name': 'Роль пользователя',
+                'verbose_name_plural': 'Роли пользователей',
            },
        ),
        migrations.CreateModel(
-            name='UserAccount',
+            name='Account',
            fields=[
                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                ('password', models.CharField(max_length=128, verbose_name='password')),
                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
                ('first_name', models.CharField(max_length=100, verbose_name='Имя')),
-                ('last_name', models.CharField(max_length=100, verbose_name='Фамилия')),
+                ('last_name', models.CharField(blank=True, max_length=100, null=True, verbose_name='Фамилия')),
                ('middle_name', models.CharField(blank=True, max_length=100, null=True, verbose_name='Отчество')),
                ('phone', models.CharField(blank=True, max_length=20, null=True, verbose_name='Телефон')),
                ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='Почта')),
-                ('username', models.CharField(max_length=150, unique=True, verbose_name='Имя пользователя')),
-                ('is_active', models.BooleanField(default=True, verbose_name='Активен')),
+                ('login', models.CharField(max_length=150, unique=True, verbose_name='Логин')),
                ('is_staff', models.BooleanField(default=False, verbose_name='Сотрудник')),
+                ('is_active', models.BooleanField(default=True, verbose_name='Активен')),
                ('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')),
-                ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.role', verbose_name='Роль')),
+                ('role', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='users.role', verbose_name='Роль пользователя')),
                ('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')),
            ],
            options={
-                'verbose_name': 'Пользователь',
-                'verbose_name_plural': 'Пользователи',
+                'verbose_name': 'Аккаунт',
+                'verbose_name_plural': 'Аккаунты',
            },
        ),
    ]
--- a/users/models.py
+++ b/users/models.py
@@ -1,48 +1,54 @@
 from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, PermissionsMixin
 from django.db import models

-from core.mixins import ContactMixin
+from core.models import ContactMixin


+## Пользователи
+
 class Role(models.Model):
-    name = models.CharField(max_length=20, unique=True, verbose_name='Название роли')
+    name = models.CharField(max_length=100, verbose_name="Название роли")

    def __str__(self):
        return self.name

    class Meta:
-        verbose_name = 'Роль'
-        verbose_name_plural = 'Роли'
+        verbose_name = "Роль пользователя"
+        verbose_name_plural = "Роли пользователей"

-class UserAccountManager(BaseUserManager):
-    def create_user(self, username, password=None, role=None, **extra_fields):
-        if not username:
-            raise ValueError('Имя пользователя должно быть указано')
-        user = self.model(username=username, role=role, **extra_fields)
+
+class AccountManager(BaseUserManager):
+    def create_user(self, login, password=None, **extra_fields):
+        if not login:
+            raise ValueError("Login must be set")
+        user = self.model(login=login, **extra_fields)
        user.set_password(password)
        user.save(using=self._db)
        return user

-    def create_superuser(self, username, password=None, **extra_fields):
-        admin_role, _ = Role.objects.get_or_create(name='admin')
-        extra_fields.setdefault('is_staff', True)
-        extra_fields.setdefault('is_superuser', True)
-        return self.create_user(username, password, role=admin_role, **extra_fields)
+    def create_superuser(self, login, password=None, **extra_fields):
+        extra_fields.setdefault("is_staff", True)
+        extra_fields.setdefault("is_superuser", True)
+        return self.create_user(login, password, **extra_fields)

-class UserAccount(ContactMixin, AbstractBaseUser, PermissionsMixin):
-    username = models.CharField(max_length=150, unique=True, verbose_name='Имя пользователя')
-    role = models.ForeignKey(Role, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='Роль')
-    is_active = models.BooleanField(default=True, verbose_name='Активен')
-    is_staff = models.BooleanField(default=False, verbose_name='Сотрудник')

-    objects = UserAccountManager()
+class Account(ContactMixin, AbstractBaseUser, PermissionsMixin):
+    login = models.CharField(max_length=150, unique=True, verbose_name="Логин")
+    role = models.ForeignKey(
+        Role, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="Роль пользователя"
+    )
+    is_staff = models.BooleanField(default=False, verbose_name="Сотрудник")
+    is_active = models.BooleanField(default=True, verbose_name="Активен")

-    USERNAME_FIELD = 'username'
+    USERNAME_FIELD = "login"
    REQUIRED_FIELDS = []

+    objects = AccountManager()
+
    def __str__(self):
-        return self.username+" ("+ContactMixin.__str__(self)+")"
+        return self.login

    class Meta:
-        verbose_name = 'Пользователь'
-        verbose_name_plural = 'Пользователи'
+        verbose_name = "Аккаунт"
+        verbose_name_plural = "Аккаунты"
+