Merge pull request 'fix' (#124) from behruz into main

Reviewed-on: #124

config/conf/navigation.py

@@ -186,5 +186,31 @@ PAGES = [
                 "link": reverse_lazy("admin:shared_villagemodel_changelist"),
             },
         ]
+    },
+    {
+        "title": _("Ruxsatlar"),
+        "separator": True,
+        "items": [
+            {
+                "title": _("Ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permission_changelist"),
+            },
+            {
+                "title": _("Sahifa uchun ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permissiontotab_changelist"),
+            },
+            {
+                "title": _("Actionlar uchun ruxsatlar"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_permissiontoaction_changelist"),
+            },
+            {
+                "title": _("Role"),
+                "icon": "attach_file",
+                "link": reverse_lazy("admin:accounts_role_changelist"),
+            },
+        ]
     }
 ]

core/apps/accounts/admin/permission.py

@@ -6,13 +6,16 @@ from core.apps.accounts.models.permission import (
     Role,
 )
 
-
 @admin.register(PermissionToAction)
 class PermissionToActionAdmin(admin.ModelAdmin):
     list_display = ("id", "name", "code", "created_at")
     search_fields = ("name", "code")
-    list_filter = ("created_at",)
+
-    ordering = ("-id",)
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+    )
 
 
 @admin.register(PermissionToTab)
@@ -20,8 +23,15 @@ class PermissionToTabAdmin(admin.ModelAdmin):
     list_display = ("id", "name", "code", "created_at")
     search_fields = ("name", "code")
     filter_horizontal = ("permission_to_actions",)
-    list_filter = ("created_at",)
+
-    ordering = ("-id",)
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+        ("Harakatlar", {
+            "fields": ("permission_to_actions",),
+        }),
+    )
 
 
 @admin.register(Permission)
@@ -29,16 +39,39 @@ class PermissionAdmin(admin.ModelAdmin):
     list_display = ("id", "name", "code", "created_at")
     search_fields = ("name", "code")
     filter_horizontal = ("permission_tabs",)
-    list_filter = ("created_at",)
+
-    ordering = ("-id",)
+    fieldsets = (
+        ("Asosiy", {
+            "fields": ("name", "code"),
+        }),
+        ("Bog‘lanishlar", {
+            "fields": ("permission_tabs",),
+        }),
+    )
 
 
 @admin.register(Role)
 class RoleAdmin(admin.ModelAdmin):
     list_display = ("id", "name")
     search_fields = ("name",)
+
     filter_horizontal = (
         "permissions",
         "permission_to_tabs",
         "permission_to_actions",
-    )
+    )
+
+    fieldsets = (
+        ("Asosiy ma'lumotlar", {
+            "fields": ("name", "comment"),
+        }),
+        ("Sahifa ruxsatlari", {
+            "fields": ("permissions",),
+        }),
+        ("Bo‘lim ruxsatlari", {
+            "fields": ("permission_to_tabs",),
+        }),
+        ("Harakat ruxsatlari", {
+            "fields": ("permission_to_actions",),
+        }),
+    )

core/apps/accounts/serializers/permission.py

@@ -25,10 +25,28 @@ class PermissionSerializer(serializers.ModelSerializer):
         fields = ['id', 'name', 'permission_tabs']
 
 
+class PermissionToActionListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PermissionToAction
+        fields = ['id', 'name']
+
+
+class PermissionToTabListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = PermissionToTab
+        fields = ['id', 'name']
+
+
+class PermissionListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Permission
+        fields = ['id', 'name']
+
+
 class RoleListSerializer(serializers.ModelSerializer):
-    permissions = PermissionSerializer(many=True)
+    permissions = PermissionListSerializer(many=True)
-    permission_to_tabs = PermissionToTabSerializer(many=True)
+    permission_to_tabs = PermissionToTabListSerializer(many=True)
-    permission_to_actions = PermissionToActionSerializer(many=True)
+    permission_to_actions = PermissionToActionListSerializer(many=True)
 
     class Meta:
         model = Role