github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-28 16:16:41 +00:00
Code Issues Projects Releases Wiki Activity

修改 terminal上报接口和api

Browse Source
This commit is contained in:
ibuler
2017-11-14 09:44:16 +08:00
parent 3639b190e3
commit 7f9ce57318
14 changed files with 291 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/assets/models/user.py
View File

@@ -199,8 +199,7 @@ class SystemUser(models.Model):
return assets
def get_assets(self):
assets = set(self.assets.all()
) | self.get_assets_inherit_from_asset_groups()
assets = set(self.assets.all()) | self.get_assets_inherit_from_asset_groups()
return list(assets)
def _to_secret_json(self):