From 127a2073f8f5bccc334ecdedbcf2395068639c32 Mon Sep 17 00:00:00 2001 From: Shaxobff Date: Fri, 24 Apr 2026 16:51:15 +0500 Subject: [PATCH 1/2] UPDATE --- .../permissions => accounts/models}/permission.py | 5 +++-- core/apps/accounts/models/user.py | 2 +- core/apps/evaluation/views/permission.py | 0 3 files changed, 4 insertions(+), 3 deletions(-) rename core/apps/{evaluation/permissions => accounts/models}/permission.py (93%) create mode 100644 core/apps/evaluation/views/permission.py diff --git a/core/apps/evaluation/permissions/permission.py b/core/apps/accounts/models/permission.py similarity index 93% rename from core/apps/evaluation/permissions/permission.py rename to core/apps/accounts/models/permission.py index 3b305c2..f91a71c 100644 --- a/core/apps/evaluation/permissions/permission.py +++ b/core/apps/accounts/models/permission.py @@ -1,9 +1,10 @@ from django.db import models from django.utils.translation import gettext_lazy as _ +from django_core.models import AbstractBaseModel from pydantic import BaseModel -class PermissionToAction(BaseModel): +class PermissionToAction(AbstractBaseModel): name = models.CharField(max_length=200) code = models.CharField(max_length=100, unique=True) @@ -15,7 +16,7 @@ class PermissionToAction(BaseModel): verbose_name_plural = _('Harakatlar uchun ruxsatnomalar') -class PermissionToTab(BaseModel): +class PermissionToTab(AbstractBaseModel): name = models.CharField(max_length=200) code = models.CharField(max_length=100, unique=True) permission_to_actions = models.ManyToManyField( diff --git a/core/apps/accounts/models/user.py b/core/apps/accounts/models/user.py index f24edda..78828ce 100644 --- a/core/apps/accounts/models/user.py +++ b/core/apps/accounts/models/user.py @@ -1,9 +1,9 @@ from django.contrib.auth import models as auth_models from django.db import models +from .permission import Role from ..choices import RoleChoice from ..managers import UserManager -from ...evaluation.permissions.permission import Role class User(auth_models.AbstractUser): diff --git a/core/apps/evaluation/views/permission.py b/core/apps/evaluation/views/permission.py new file mode 100644 index 0000000..e69de29 -- 2.49.1 From c9d60acfc96507c1168f60bc9b5c53d3424ae88e Mon Sep 17 00:00:00 2001 From: Shaxobff Date: Fri, 24 Apr 2026 17:07:36 +0500 Subject: [PATCH 2/2] UPDATE --- core/apps/accounts/models/permission.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/apps/accounts/models/permission.py b/core/apps/accounts/models/permission.py index f91a71c..1488c31 100644 --- a/core/apps/accounts/models/permission.py +++ b/core/apps/accounts/models/permission.py @@ -31,7 +31,7 @@ class PermissionToTab(AbstractBaseModel): verbose_name_plural = _("Bo'lim uchun ruxsatnomalar") -class Permission(BaseModel): +class Permission(AbstractBaseModel): name = models.CharField(max_length=200) code = models.CharField(max_length=100, unique=True) permission_tab = models.ManyToManyField(PermissionToTab, related_name='permissions') -- 2.49.1