From 39e050f0870af15dc00bcd5add570ec0a0aed9d0 Mon Sep 17 00:00:00 2001 From: Andrey Smakotin Date: Fri, 16 Jan 2026 12:57:29 +0300 Subject: [PATCH] =?UTF-8?q?refactor(user=5Froles):=20=D0=B8=D1=81=D0=BF?= =?UTF-8?q?=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20Custom?= =?UTF-8?q?User=20=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=BC=D1=83=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- myproject/user_roles/views.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/myproject/user_roles/views.py b/myproject/user_roles/views.py index 1836cd6..41d0884 100644 --- a/myproject/user_roles/views.py +++ b/myproject/user_roles/views.py @@ -1,12 +1,12 @@ from django.shortcuts import render, redirect, get_object_or_404 from django.contrib.auth.decorators import login_required from django.contrib import messages -from django.contrib.auth import get_user_model from user_roles.models import Role, UserRole from user_roles.services import RoleService from user_roles.decorators import owner_required -User = get_user_model() +# Импортируем CustomUser напрямую, т.к. AUTH_USER_MODEL = PlatformAdmin +from accounts.models import CustomUser @login_required @@ -53,11 +53,11 @@ def user_role_create(request): # Если пароль не указан, генерируем случайный if not password: - password = User.objects.make_random_password(12) + password = CustomUser.objects.make_random_password(12) try: # Проверяем, не существует ли уже пользователь с таким email - existing_user = User.objects.filter(email=email).first() + existing_user = CustomUser.objects.filter(email=email).first() if existing_user: # Пользователь существует - проверяем его статус @@ -80,7 +80,7 @@ def user_role_create(request): return render(request, 'user_roles/user_role_create.html', context) else: # Создаем нового пользователя - user = User.objects.create_user( + user = CustomUser.objects.create_user( email=email, name=name, password=password, @@ -137,7 +137,7 @@ def user_role_edit(request, pk): # Обработка пересоздания пароля if action == 'regenerate_password': try: - new_password = User.objects.make_random_password(12) + new_password = CustomUser.objects.make_random_password(12) user_role.user.set_password(new_password) user_role.user.save()