diff --git a/apps/locale/en/LC_MESSAGES/django.po b/apps/locale/en/LC_MESSAGES/django.po index 3c38f633a..547b90905 100644 --- a/apps/locale/en/LC_MESSAGES/django.po +++ b/apps/locale/en/LC_MESSAGES/django.po @@ -6197,7 +6197,7 @@ msgid "Get ldap users is None" msgstr "" #: settings/ws.py:205 -msgid "Imported {} users successfully (Organization: {})" +msgid "Total {}, success {}, failure {}" msgstr "" #: templates/_csv_import_export.html:8 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index eb7634b3d..543627ae5 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -6295,8 +6295,8 @@ msgid "Get ldap users is None" msgstr "获取 LDAP 用户为 None" #: settings/ws.py:205 -msgid "Imported {} users successfully (Organization: {})" -msgstr "成功导入 {} 个用户 ( 组织: {} )" +msgid "Total {}, success {}, failure {}" +msgstr "总共 {},成功 {},失败 {}" #: templates/_csv_import_export.html:8 msgid "Export" diff --git a/apps/settings/ws.py b/apps/settings/ws.py index dd0d16af4..0f061d660 100644 --- a/apps/settings/ws.py +++ b/apps/settings/ws.py @@ -193,16 +193,14 @@ class LdapWebsocket(AsyncJsonWebsocketConsumer): users = self.get_ldap_users(username_list, cache_police) if users is None: msg = _('Get ldap users is None') - - orgs = self.get_orgs(org_ids) - new_users, error_msg = LDAPImportUtil().perform_import(users, orgs) - if error_msg: - msg = error_msg - - count = users if users is None else len(users) - orgs_name = ', '.join([str(org) for org in orgs]) - ok = True - msg = _('Imported {} users successfully (Organization: {})').format(count, orgs_name) + else: + orgs = self.get_orgs(org_ids) + _new_users, error_msg = LDAPImportUtil().perform_import(users, orgs) + ok = True + success_count = len(users) - len(error_msg) + msg = _('Total {}, success {}, failure {}').format( + len(users), success_count, len(error_msg) + ) except Exception as e: msg = str(e) return ok, msg