github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-07 18:31:04 +00:00
Code Issues Projects Releases Wiki Activity

perf: 修改支持 Django4

Browse Source
This commit is contained in:
ibuler
2023-07-24 11:52:25 +08:00
parent 16660575b7
commit b4b9c805ff
243 changed files with 546 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/rbac/api/rolebinding.py
View File

@@ -1,10 +1,10 @@
from django.utils.translation import ugettext as _
from django.db.models import F, Value
from django.db.models.functions import Concat
from django.utils.translation import gettext as _
from common.exceptions import JMSException
from orgs.mixins.api import OrgBulkModelViewSet
from orgs.utils import current_org
from common.exceptions import JMSException
from .. import serializers
from ..models import RoleBinding, SystemRoleBinding, OrgRoleBinding
@@ -26,15 +26,15 @@ class RoleBindingViewSet(OrgBulkModelViewSet):
]
def get_queryset(self):
queryset = self._get_queryset()\
queryset = self._get_queryset() \
.prefetch_related('user', 'role', 'org') \
.annotate(
user_display=Concat(
F('user__name'), Value('('),
F('user__username'), Value(')')
),
role_display=F('role__name')
)
user_display=Concat(
F('user__name'), Value('('),
F('user__username'), Value(')')
),
role_display=F('role__name')
)
return queryset
def _get_queryset(self):