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

Merge pull request #10120 from jumpserver/pr@v3.1@fix_ldapuserimport_v3.1 

fix: 修复 LDAP 导入用户时指定其他组织，还会导入到 Default 组织的问题
pull/10160/head
老广 2023-04-03 17:10:20 +08:00 committed by GitHub
parent 012da07999 339d872d37
commit 06a24b1a04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/settings/tasks/ldap.py
View File

@ -1,9 +1,9 @@
# coding: utf-8 # coding: utf-8
# #
from celery import shared_task from celery import shared_task
from django.conf import settings from django.conf import settings
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.db import transaction
from common.utils import get_logger from common.utils import get_logger
from ops.celery.decorator import after_app_ready_start from ops.celery.decorator import after_app_ready_start
from ops.celery.utils import ( from ops.celery.utils import (
@ -22,6 +22,7 @@ def sync_ldap_user():
@shared_task(verbose_name=_('Import ldap user')) @shared_task(verbose_name=_('Import ldap user'))
@transaction.atomic
def import_ldap_user(): def import_ldap_user():
logger.info("Start import ldap user task") logger.info("Start import ldap user task")
util_server = LDAPServerUtil() util_server = LDAPServerUtil()