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

fix: 用户离开组织命令复核没有删除

pull/6868/head
xinwen 2021-09-15 16:57:45 +08:00 committed by Jiangjie.Bai
parent cfab30f7f7
commit dee45ce2e0
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/orgs/signals_handler/common.py
View File

@ -19,6 +19,7 @@ from common.decorator import on_transaction_commit
from common.signals import django_ready from common.signals import django_ready
from common.utils import get_logger from common.utils import get_logger
from common.utils.connection import RedisPubSub from common.utils.connection import RedisPubSub
from assets.models import CommandFilterRule
logger = get_logger(__file__) logger = get_logger(__file__)
@ -91,17 +92,18 @@ def on_org_delete(sender, instance, **kwargs):
root_node.delete() root_node.delete()
def _remove_users(model, users, org): def _remove_users(model, users, org, user_field_name='users'):
with tmp_to_org(org): with tmp_to_org(org):
if not isinstance(users, (tuple, list, set)): if not isinstance(users, (tuple, list, set)):
users = (users, ) users = (users, )
m2m_model = model.users.through user_field = getattr(model, user_field_name)
reverse = model.users.reverse m2m_model = user_field.through
reverse = user_field.reverse
if reverse: if reverse:
m2m_field_name = model.users.field.m2m_reverse_field_name() m2m_field_name = user_field.field.m2m_reverse_field_name()
else: else:
m2m_field_name = model.users.field.m2m_field_name() m2m_field_name = user_field.field.m2m_field_name()
relations = m2m_model.objects.filter(**{ relations = m2m_model.objects.filter(**{
'user__in': users, 'user__in': users,
f'{m2m_field_name}__org_id': org.id f'{m2m_field_name}__org_id': org.id
@ -149,6 +151,8 @@ def _clear_users_from_org(org, users):
for m in models: for m in models:
_remove_users(m, users, org) _remove_users(m, users, org)
_remove_users(CommandFilterRule, users, org, user_field_name='reviewers')
@receiver(m2m_changed, sender=OrganizationMember) @receiver(m2m_changed, sender=OrganizationMember)
def on_org_user_changed(action, instance, reverse, pk_set, **kwargs): def on_org_user_changed(action, instance, reverse, pk_set, **kwargs):