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

[Bugfix] 解决进入授权详情页的资产管理页面bug

pull/2874/head
BaiJiangJie 2019-07-02 17:48:29 +08:00
parent 98260b5b52
commit 003601bbdd
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/perms/models/asset_permission.py
View File

@ -96,6 +96,14 @@ class AssetPermission(BasePermission):
def get_queryset_with_prefetch(cls): def get_queryset_with_prefetch(cls):
return cls.objects.all().valid().prefetch_related('nodes', 'assets', 'system_users') return cls.objects.all().valid().prefetch_related('nodes', 'assets', 'system_users')
def get_all_assets(self):
assets = set(self.assets.all())
for node in self.nodes.all():
_assets = node.get_all_assets()
set_or_append_attr_bulk(_assets, 'inherit', node.value)
assets.update(set(_assets))
return assets
class NodePermission(OrgModelMixin): class NodePermission(OrgModelMixin):
id = models.UUIDField(default=uuid.uuid4, primary_key=True) id = models.UUIDField(default=uuid.uuid4, primary_key=True)

2
apps/perms/views/asset_permission.py
View File

@ -156,7 +156,7 @@ class AssetPermissionAssetView(PermissionsMixin,
permission_classes = [IsOrgAdmin] permission_classes = [IsOrgAdmin]
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
self.object = self.get_object(queryset = AssetPermission.objects.all()) self.object = self.get_object(queryset=AssetPermission.objects.all())
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
def get_queryset(self): def get_queryset(self):