8 Commits

Author SHA1 Message Date
xoliqberdiyev
5f70d69896 fux 2026-04-28 18:02:39 +05:00
xoliqberdiyev
f0d93b10ac Merge branch 'main' of https://gitea.felixits.uz/sifatbaho/backend-v1 into behruz 2026-04-28 17:48:03 +05:00
435dd56334 Merge pull request 'fix error' (#121) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Has been cancelled
Reviewed-on: #121
2026-04-28 12:40:16 +00:00
eaaba123b0 Merge pull request 'add new fields to request-evalution api' (#120) from behruz into main
Some checks failed
Deploy to Production / build-and-deploy (push) Failing after 53s
Reviewed-on: #120
2026-04-28 12:30:43 +00:00
github-actions[bot]
d065891ad5 🔄 Update image to 138 [CI SKIP] 2026-04-28 11:11:54 +00:00
94c4d03925 Merge pull request 'remove unused fields from auto-evalution model' (#119) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 2m10s
Reviewed-on: #119
2026-04-28 11:10:06 +00:00
github-actions[bot]
d1f0a5a9ae 🔄 Update image to 137 [CI SKIP] 2026-04-28 11:07:21 +00:00
0084d11c62 Merge pull request 'change response of permissions apis' (#118) from behruz into main
All checks were successful
Deploy to Production / build-and-deploy (push) Successful in 4m25s
Reviewed-on: #118
2026-04-28 11:05:35 +00:00
6 changed files with 50 additions and 6 deletions

View File

@@ -13,7 +13,7 @@ from config.env import env
def home(request):
return HttpResponse("OK: #560cbe8000acd2c690f4efc4d40bfc131aa37796")
return HttpResponse("OK: #94c4d039257329673ba7f48869b1660e7bef6195")
urlpatterns = [

View File

@@ -1,2 +1,3 @@
from .core import * # noqa
from .user import * # noqa
from .permission import *

View File

@@ -0,0 +1,44 @@
from django.contrib import admin
from core.apps.accounts.models.permission import (
PermissionToAction,
PermissionToTab,
Permission,
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",)
@admin.register(PermissionToTab)
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",)
@admin.register(Permission)
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",)
@admin.register(Role)
class RoleAdmin(admin.ModelAdmin):
list_display = ("id", "name")
search_fields = ("name",)
filter_horizontal = (
"permissions",
"permission_to_tabs",
"permission_to_actions",
)

View File

@@ -18,11 +18,11 @@ class PermissionToTabSerializer(serializers.ModelSerializer):
class PermissionSerializer(serializers.ModelSerializer):
permission_to_tabs = PermissionToTabSerializer(many=True)
permission_tabs = PermissionToTabSerializer(many=True)
class Meta:
model = Permission
fields = ['id', 'name', 'permission_to_tabs']
fields = ['id', 'name', 'permission_tabs']
class RoleListSerializer(serializers.ModelSerializer):

View File

@@ -30,7 +30,6 @@ class PermissionToTabViewSet(BaseViewSetMixin, ModelViewSet):
serializer_class = PermissionToTabSerializer
@extend_schema(tags=["permission"])
class PermissionViewSet(BaseViewSetMixin, ModelViewSet):
queryset = Permission.objects.all()

View File

@@ -84,7 +84,7 @@ services:
max-file: "5"
web:
image: husanjon/sifatbaho:136
image: husanjon/sifatbaho:138
env_file:
- .env
environment:
@@ -129,7 +129,7 @@ services:
max-file: "5"
celery:
image: husanjon/sifatbaho:136
image: husanjon/sifatbaho:138
env_file:
- .env
environment: