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

fix: perm del node and user group 500

pull/15412/head
feng 2025-05-15 15:53:16 +08:00 committed by ZhaoJiSen
parent e1f03a194b
commit 9969395500
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/orgs/mixins/api.py
View File

@ -70,6 +70,6 @@ class OrgRelationMixin(RelationMixin):
def get_queryset(self): def get_queryset(self):
queryset = super().get_queryset() queryset = super().get_queryset()
if not current_org.is_root(): if not current_org.is_root():
org_id = current_org.org_id() org_id = current_org.id
queryset = queryset.filter(**{f'{self.from_field}__org_id': org_id}) queryset = queryset.filter(**{f'{self.from_field}__org_id': org_id})
return queryset return queryset

2
apps/perms/api/asset_permission_relation.py
View File

@ -27,7 +27,7 @@ class RelationMixin(OrgRelationMixin, OrgBulkModelViewSet):
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.id
if org_id is not None: if org_id is not None:
queryset = queryset.filter(assetpermission__org_id=org_id) queryset = queryset.filter(assetpermission__org_id=org_id)
queryset = queryset.annotate(assetpermission_display=F('assetpermission__name')) queryset = queryset.annotate(assetpermission_display=F('assetpermission__name'))