Merge pull request 'UPDATE' (#98) from shaxob into main

Reviewed-on: #98

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(
@@ -30,7 +31,7 @@ class PermissionToTab(BaseModel):
         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')

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):