github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-25 06:42:49 +00:00
Code Issues Projects Releases Wiki Activity

perf: merge v3

Browse Source
This commit is contained in:
ibuler
2022-08-23 10:26:43 +08:00
parent ab46194039 97c6e2c0b2
commit 1e57a0eb1f
26 changed files with 166 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,12 +80,12 @@ class AssetPermissionAssetRelationViewSet(RelationMixin):
filterset_fields = [
'id', 'asset', 'assetpermission',
]
search_fields = ["id", "asset__hostname", "asset__ip", "assetpermission__name"]
search_fields = ["id", "asset__name", "asset__ip", "assetpermission__name"]
def get_queryset(self):
queryset = super().get_queryset()
queryset = queryset \
.annotate(asset_display=F('asset__hostname'))
.annotate(asset_display=F('asset__name'))
return queryset

4
apps/perms/api/user_permission/common.py
View File

@@ -12,7 +12,9 @@ from rest_framework.generics import (
)
from orgs.utils import tmp_to_root_org
from perms.utils.permission import get_asset_system_user_ids_with_actions_by_user, validate_permission
from perms.utils.permission import (
get_asset_system_user_ids_with_actions_by_user, validate_permission
)
from common.permissions import IsValidUser
from common.utils import get_logger, lazyproperty