github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-06 18:00:57 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改LDAP用户导入的组织为当前组织

Browse Source
This commit is contained in:
Bai
2021-06-22 19:09:34 +08:00
committed by Jiangjie.Bai
parent a02d80a2ae
commit 50bd0b796d
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/settings/utils/ldap.py
View File

@@ -362,15 +362,19 @@ class LDAPImportUtil(object):
)
return obj, created
def perform_import(self, users):
def perform_import(self, users, org=None):
logger.info('Start perform import ldap users, count: {}'.format(len(users)))
errors = []
objs = []
for user in users:
try:
self.update_or_create(user)
obj, created = self.update_or_create(user)
objs.append(obj)
except Exception as e:
errors.append({user['username']: str(e)})
logger.error(e)
if org and not org.is_root():
org.members.add(*objs)
logger.info('End perform import ldap users')
return errors