github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-29 04:40:18 +00:00
Code Issues Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
ibuler
2017-07-20 07:55:24 +08:00
parent 61014c747e
commit 477d23ea37
6 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/perms/utils.py
View File

@@ -235,7 +235,7 @@ def push_system_user(assets, system_user):
return task.id
def associate_system_users_and_assets(system_users, assets, asset_groups):
def associate_system_users_and_assets(system_users, assets, asset_groups, force=False):
"""关联系统用户和资产, 目的是保存它们的关系, 然后新加入的资产或系统
用户时,推送系统用户到资产
@@ -250,12 +250,14 @@ def associate_system_users_and_assets(system_users, assets, asset_groups):
for system_user in system_users:
assets_need_push = []
if system_user.auto_push:
assets_need_push.extend(
[asset for asset in assets_all
if asset not in system_user.assets.all()
]
)
if force:
assets_need_push = assets_all
else:
assets_need_push.extend(
[asset for asset in assets_all
if asset not in system_user.assets.all()
]
)
system_user.assets.add(*(tuple(assets_all)))
push_system_user(assets_need_push, system_user)