github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-09-02 07:55:16 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修改LDAP同步提示信息 (#6872)

Browse Source 
* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改资产和特权用户发生变化时，更新资产的admin_user

* fix: 修改LDAP同步提示信息

Co-authored-by: Michael Bai <baijiangjie@gmail.com>
This commit is contained in:
fit2bot
2021-09-15 19:16:44 +08:00
committed by GitHub
parent fbe5f9a63a
commit 9dda19b8d7
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/settings/api/ldap.py
View File

@@ -149,16 +149,16 @@ class LDAPUserListApi(generics.ListAPIView):
sync_util.set_task_status(sync_util.TASK_STATUS_IS_RUNNING)
t = threading.Thread(target=sync_ldap_user)
t.start()
data = {'msg': 'Sync start.'}
data = {'msg': _('Synchronization start, please wait.')}
return Response(data=data, status=409)
# 同步任务正在执行
if sync_util.task_is_running:
data = {'msg': 'synchronization is running.'}
data = {'msg': _('Synchronization is running, please wait.')}
return Response(data=data, status=409)
# 同步任务执行结束
if sync_util.task_is_over:
msg = sync_util.get_task_error_msg()
data = {'error': 'Synchronization error: {}'.format(msg)}
data = {'error': _('Synchronization error: {}'.format(msg))}
return Response(data=data, status=400)
return super().list(request, *args, **kwargs)