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

Merge pull request #3157 from jumpserver/v52_perms 

[Update] 修复创建授权规则授权节点时，系统用户不自动推送的问题
pull/3158/head
BaiJiangJie 2019-08-26 11:56:40 +08:00 committed by GitHub
parent f47f8a66fe fb94050732
commit 57eed7fab6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/assets/signals_handler.py
View File

@ -57,16 +57,16 @@ def on_system_user_update(sender, instance=None, created=True, **kwargs):
push_system_user_to_assets.delay(instance, assets) push_system_user_to_assets.delay(instance, assets)
# @receiver(m2m_changed, sender=SystemUser.nodes.through) @receiver(m2m_changed, sender=SystemUser.nodes.through)
# def on_system_user_nodes_change(sender, instance=None, **kwargs): def on_system_user_nodes_change(sender, instance=None, **kwargs):
# if instance and kwargs["action"] == "post_add": if instance and kwargs["action"] == "post_add":
# logger.info("System user `{}` nodes update signal received".format(instance)) logger.info("System user `{}` nodes update signal received".format(instance))
# assets = set() assets = set()
# nodes = kwargs['model'].objects.filter(pk__in=kwargs['pk_set']) nodes = kwargs['model'].objects.filter(pk__in=kwargs['pk_set'])
# for node in nodes: for node in nodes:
# assets.update(set(node.get_all_assets())) assets.update(set(node.get_all_assets()))
# instance.assets.add(*tuple(assets)) instance.assets.add(*tuple(assets))
#
@receiver(m2m_changed, sender=SystemUser.assets.through) @receiver(m2m_changed, sender=SystemUser.assets.through)
def on_system_user_assets_change(sender, instance=None, **kwargs): def on_system_user_assets_change(sender, instance=None, **kwargs):