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

fix(orgs): 组织添加成员bug

pull/4777/head
xinwen 2020-10-12 19:29:22 +08:00 committed by 老广
parent 2190db1bb5
commit 2432b9a553
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/orgs/models.py
View File

@ -231,7 +231,7 @@ def _none2list(*args):
def _users2pks(users, admins, auditors):
return [user.pk for user in chain(users, admins, auditors)]
return [user.pk for user in chain(users, admins, auditors) if hasattr(user, 'pk')]
class UserRoleMapper(dict):
@ -295,11 +295,11 @@ class OrgMemeberManager(models.Manager):
)
oms_add = []
for users, role in add_mapper:
for user in users:
if isinstance(user, models.Model):
user = user.id
oms_add.append(self.model(org_id=org.id, user_id=user, role=role))
for _users, _role in add_mapper:
for _user in _users:
if isinstance(_user, models.Model):
_user = _user.id
oms_add.append(self.model(org_id=org.id, user_id=_user, role=_role))
send = partial(signals.m2m_changed.send, sender=self.model, instance=org, reverse=False,
model=User, pk_set=_users2pks(users, admins, auditors), using=self.db)