github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: 资产授权权限bug

pull/7756/head
feng626 2022-03-07 18:22:21 +08:00 committed by Jiangjie.Bai
parent 8271492ec1
commit 79994f5ddc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/perms/api/asset/asset_permission_relation.py
View File

@ -21,6 +21,8 @@ __all__ = [
class RelationMixin(OrgRelationMixin, OrgBulkModelViewSet): class RelationMixin(OrgRelationMixin, OrgBulkModelViewSet):
perm_model = models.AssetPermission
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
org_id = current_org.org_id() org_id = current_org.org_id()
@ -128,9 +130,8 @@ class AssetPermissionSystemUserRelationViewSet(RelationMixin):
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
queryset = queryset \ queryset = queryset.annotate(
.annotate(systemuser_display=Concat( systemuser_display=Concat(
F('systemuser__name'), Value('('), F('systemuser__username'), F('systemuser__name'), Value('('), F('systemuser__username'), Value(')')
Value(')')
)) ))
return queryset return queryset