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

[Feture] 添加ops 页面

Browse Source
This commit is contained in:
ibuler
2017-12-11 00:29:25 +08:00
parent 18fd04d63c
commit 0c9e24dc59
41 changed files with 1445 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,21 +201,6 @@ class SystemUser(models.Model):
def public_key(self, public_key_raw):
self._public_key = signer.sign(public_key_raw)
def get_assets_inherit_from_asset_groups(self):
assets = set()
asset_groups = self.asset_groups.all()
for asset_group in asset_groups:
for asset in asset_group.assets.all():
setattr(asset, 'is_inherit_from_asset_groups', True)
setattr(asset, 'inherit_from_asset_groups',
getattr(asset, 'inherit_from_asset_groups', set()).add(asset_group))
assets.add(asset)
return assets
def get_assets(self):
assets = set(self.assets.all()) | self.get_assets_inherit_from_asset_groups()
return list(assets)
def _to_secret_json(self):
"""Push system user use it"""
return {
@@ -232,10 +217,6 @@ class SystemUser(models.Model):
def assets_amount(self):
return self.assets.count()
@property
def asset_group_amount(self):
return self.asset_groups.count()
def to_json(self):
return {
'id': self.id,