github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2026-01-29 21:51:31 +00:00
Code Issues Projects Releases Wiki Activity

Finish permissin detail asset list and user list

Browse Source
This commit is contained in:
ibuler
2016-09-14 23:29:39 +08:00
parent 5bca783e12
commit a4dc27f073
6 changed files with 119 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/perms/models.py
View File

@@ -55,7 +55,7 @@ class AssetPermission(models.Model):
return []
def get_granted_assets(self):
return list(self.assets.all() or []) | set(self.get_granted_asset_groups_member())
return list(set(self.assets.all() or []) | set(self.get_granted_asset_groups_member()))
def get_granted_asset_groups_member(self):
combine_assets = functools.partial(combine_seq, callback=AssetPermission.set_inherit)