From 0a931bbf776dc39b729922c7c9c92e13b9a33e50 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 22 Jan 2018 11:38:40 +0800
Subject: [PATCH] [Feature] es support

---
 apps/common/api.py                   |   5 -
 apps/common/fields.py                |   1 -
 apps/common/forms.py                 |   4 +-
 apps/common/models.py                |  10 +-
 apps/common/views.py                 |   1 -
 apps/jumpserver/settings.py          |   4 -
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 31661 -> 32209 bytes
 apps/locale/zh/LC_MESSAGES/django.po | 227 ++++++++++++++++-----------
 apps/users/forms.py                  |   1 -
 9 files changed, 147 insertions(+), 106 deletions(-)

diff --git a/apps/common/api.py b/apps/common/api.py
index e8680e85e..e75f6147a 100644
--- a/apps/common/api.py
+++ b/apps/common/api.py
@@ -63,8 +63,6 @@ class LDAPTestingAPI(APIView):
             search_filter = serializer.validated_data["AUTH_LDAP_SEARCH_FILTER"]
             attr_map = serializer.validated_data["AUTH_LDAP_USER_ATTR_MAP"]
 
-            print(serializer.validated_data)
-
             try:
                 attr_map = json.loads(attr_map)
             except json.JSONDecodeError:
@@ -77,9 +75,6 @@ class LDAPTestingAPI(APIView):
             except Exception as e:
                 return Response({"error": str(e)}, status=401)
 
-            print(search_ou)
-            print(search_filter % ({"user": "*"}))
-            print(attr_map.values())
             ok = conn.search(search_ou, search_filter % ({"user": "*"}),
                              attributes=list(attr_map.values()))
             if not ok:
diff --git a/apps/common/fields.py b/apps/common/fields.py
index 36a8bdf9a..f19689830 100644
--- a/apps/common/fields.py
+++ b/apps/common/fields.py
@@ -18,7 +18,6 @@ class DictField(forms.Field):
         # we don't need to handle that explicitly.
         if isinstance(value, six.string_types):
             try:
-                print(value)
                 value = json.loads(value)
                 return value
             except json.JSONDecodeError:
diff --git a/apps/common/forms.py b/apps/common/forms.py
index bb708c2f7..3eb8c4989 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -36,9 +36,9 @@ class BaseForm(forms.Form):
         for name, field in self.fields.items():
             db_value = getattr(db_settings, name).value
             django_value = getattr(settings, name) if hasattr(settings, name) else None
-            if db_value is not None:
+            if db_value is False or db_value:
                 field.initial = to_form_value(db_value)
-            elif django_value is not None:
+            elif django_value is False or django_value:
                 field.initial = django_value
 
     def save(self, category="default"):
diff --git a/apps/common/models.py b/apps/common/models.py
index afee1e13d..1f634bce2 100644
--- a/apps/common/models.py
+++ b/apps/common/models.py
@@ -2,6 +2,7 @@ import json
 
 import ldap
 from django.db import models
+from django.db.utils import ProgrammingError, OperationalError
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django_auth_ldap.config import LDAPSearch
@@ -50,9 +51,12 @@ class Setting(models.Model):
 
     @classmethod
     def refresh_all_settings(cls):
-        settings_list = cls.objects.all()
-        for setting in settings_list:
-            setting.refresh_setting()
+        try:
+            settings_list = cls.objects.all()
+            for setting in settings_list:
+                setting.refresh_setting()
+        except (ProgrammingError, OperationalError):
+            pass
 
     def refresh_setting(self):
         try:
diff --git a/apps/common/views.py b/apps/common/views.py
index 1e8ad503d..dc0d74f92 100644
--- a/apps/common/views.py
+++ b/apps/common/views.py
@@ -107,7 +107,6 @@ class TerminalSettingView(AdminUserRequiredMixin, TemplateView):
         return super().get_context_data(**kwargs)
 
     def post(self, request):
-        print(request.POST)
         form = self.form_class(request.POST)
         if form.is_valid():
             form.save()
diff --git a/apps/jumpserver/settings.py b/apps/jumpserver/settings.py
index a164d3355..6b9242d45 100644
--- a/apps/jumpserver/settings.py
+++ b/apps/jumpserver/settings.py
@@ -385,10 +385,6 @@ TERMINAL_COMMAND_STORAGE = {
     #     'TYPE': 'elasticsearch',
     #     'HOSTS': ['http://elastic:changeme@localhost:9200'],
     # },
-    # 'ali-hz-es': {
-    #     'TYPE': 'elasticsearch',
-    #     'HOSTS': ['http://elastic:changeme@localhost:9200'],
-    # }
 }
 
 
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 7be8a996a99f2451a1f8854e863216f289eaa052..f6489066200c442d9a9bbce51198493a10222cac 100644
GIT binary patch
delta 11945
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

delta 11406
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
Wm7h0cWR|~o-<XVi-g4tU$p3%L^dD~k

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index c69f1340a..ec16cc439 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 17:26+0800\n"
+"POT-Creation-Date: 2018-01-22 11:04+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: assets/forms.py:23 assets/forms.py:53 assets/forms.py:99 perms/forms.py:37
-#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:246
+#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:245
 msgid "Select asset groups"
 msgstr "选择资产组"
 
@@ -44,7 +44,7 @@ msgstr "默认使用管理用户"
 
 #: assets/forms.py:76 assets/forms.py:81 assets/forms.py:127
 #: assets/templates/assets/asset_group_detail.html:75 perms/forms.py:34
-#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:243
+#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:242
 msgid "Select assets"
 msgstr "选择资产"
 
@@ -66,7 +66,7 @@ msgstr "端口"
 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:28 templates/_nav.html:22
-#: terminal/backends/command/models.py:11 terminal/models.py:93
+#: terminal/backends/command/models.py:11 terminal/models.py:124
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -77,7 +77,7 @@ msgid "Asset"
 msgstr "资产"
 
 #: assets/forms.py:161 perms/forms.py:40
-#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:249
+#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:248
 msgid "Select system users"
 msgstr "选择系统用户"
 
@@ -99,14 +99,15 @@ msgstr "选择的系统用户将会在该集群资产上创建"
 #: assets/templates/assets/cluster_detail.html:57
 #: assets/templates/assets/cluster_list.html:19
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:24 common/models.py:25
-#: ops/models.py:31 ops/templates/ops/task_detail.html:56
-#: ops/templates/ops/task_list.html:34 perms/models.py:14
+#: assets/templates/assets/system_user_list.html:24 common/models.py:26
+#: common/templates/common/terminal_setting.html:62 ops/models.py:31
+#: ops/templates/ops/task_detail.html:56 ops/templates/ops/task_list.html:34
+#: perms/models.py:14
 #: perms/templates/perms/asset_permission_create_update.html:33
 #: perms/templates/perms/asset_permission_detail.html:62
 #: perms/templates/perms/asset_permission_list.html:25
-#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:14
-#: terminal/models.py:118 terminal/templates/terminal/terminal_detail.html:43
+#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:23
+#: terminal/models.py:149 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
 #: users/models/user.py:35 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:62
@@ -126,10 +127,10 @@ msgstr "集群级别管理用户"
 
 #: assets/forms.py:200
 msgid "Password or private key password"
-msgstr "密码或秘钥不合法"
+msgstr "密码或秘钥密码"
 
 #: assets/forms.py:201 assets/forms.py:262 assets/models/user.py:30
-#: common/forms.py:107 users/forms.py:16 users/forms.py:24
+#: common/forms.py:113 users/forms.py:16 users/forms.py:24
 #: users/templates/users/login.html:56
 #: users/templates/users/reset_password.html:52
 #: users/templates/users/user_create.html:11
@@ -239,7 +240,7 @@ msgstr "测试环境"
 #: assets/templates/assets/asset_list.html:31
 #: assets/templates/assets/cluster_assets.html:52
 #: assets/templates/assets/system_user_asset.html:53
-#: assets/templates/assets/user_asset_list.html:20
+#: assets/templates/assets/user_asset_list.html:20 common/forms.py:140
 #: perms/templates/perms/asset_permission_asset.html:55
 #: users/templates/users/login_log_list.html:52
 #: users/templates/users/user_granted_asset.html:49
@@ -253,7 +254,7 @@ msgstr "IP"
 #: assets/templates/assets/asset_list.html:30
 #: assets/templates/assets/cluster_assets.html:51
 #: assets/templates/assets/system_user_asset.html:52
-#: assets/templates/assets/user_asset_list.html:19
+#: assets/templates/assets/user_asset_list.html:19 common/forms.py:139
 #: perms/templates/perms/asset_permission_asset.html:54
 #: users/templates/users/user_granted_asset.html:48
 #: users/templates/users/user_group_granted_asset.html:49
@@ -400,9 +401,9 @@ msgstr "创建日期"
 #: assets/templates/assets/asset_group_list.html:17
 #: assets/templates/assets/cluster_detail.html:97
 #: assets/templates/assets/system_user_detail.html:100
-#: assets/templates/assets/system_user_list.html:30 common/models.py:28
+#: assets/templates/assets/system_user_list.html:30 common/models.py:30
 #: ops/models.py:37 perms/models.py:24
-#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:22
+#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:33
 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
 #: users/models/user.py:47 users/templates/users/user_detail.html:110
 #: users/templates/users/user_group_detail.html:67
@@ -494,7 +495,7 @@ msgstr "Shell"
 #: assets/models/user.py:269 perms/models.py:19
 #: perms/templates/perms/asset_permission_detail.html:136
 #: perms/templates/perms/asset_permission_list.html:30 templates/_nav.html:26
-#: terminal/backends/command/models.py:12 terminal/models.py:94
+#: terminal/backends/command/models.py:12 terminal/models.py:125
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -576,9 +577,9 @@ msgstr "仅修改你需要更新的字段"
 #: assets/views/admin_user.py:106 assets/views/asset.py:48
 #: assets/views/asset.py:61 assets/views/asset.py:84 assets/views/asset.py:144
 #: assets/views/asset.py:161 assets/views/asset.py:185
-#: assets/views/cluster.py:26 assets/views/cluster.py:85
-#: assets/views/cluster.py:102 assets/views/group.py:34
-#: assets/views/group.py:52 assets/views/group.py:69 assets/views/group.py:87
+#: assets/views/cluster.py:26 assets/views/cluster.py:80
+#: assets/views/cluster.py:97 assets/views/group.py:34 assets/views/group.py:52
+#: assets/views/group.py:69 assets/views/group.py:87
 #: assets/views/system_user.py:28 assets/views/system_user.py:44
 #: assets/views/system_user.py:60 assets/views/system_user.py:75
 #: templates/_nav.html:19
@@ -602,20 +603,24 @@ msgid "Import asset"
 msgstr "导入资产"
 
 #: assets/templates/assets/_asset_import_modal.html:9
+#: common/templates/common/_add_terminal_command_storage_modal.html:9
 #: users/templates/users/_user_import_modal.html:10
 msgid "Template"
 msgstr "模板"
 
 #: assets/templates/assets/_asset_import_modal.html:10
+#: common/templates/common/_add_terminal_command_storage_modal.html:10
 #: users/templates/users/_user_import_modal.html:11
 msgid "Download"
 msgstr "下载"
 
 #: assets/templates/assets/_asset_import_modal.html:13
+#: common/templates/common/_add_terminal_command_storage_modal.html:13
 msgid "Asset csv file"
 msgstr "资产csv文件"
 
 #: assets/templates/assets/_asset_import_modal.html:16
+#: common/templates/common/_add_terminal_command_storage_modal.html:16
 msgid "If set id, will use this id update asset existed"
 msgstr "如果设置了id，则会使用该行信息更新该id的资产"
 
@@ -650,7 +655,7 @@ msgstr "自动生成秘钥"
 #: assets/templates/assets/asset_update.html:47
 #: assets/templates/assets/cluster_create_update.html:46
 #: perms/templates/perms/asset_permission_create_update.html:45
-#: terminal/templates/terminal/terminal_update.html:40
+#: terminal/templates/terminal/terminal_update.html:41
 msgid "Other"
 msgstr "其它"
 
@@ -661,11 +666,12 @@ msgstr "其它"
 #: assets/templates/assets/asset_group_create.html:16
 #: assets/templates/assets/asset_update.html:55
 #: assets/templates/assets/cluster_create_update.html:54
-#: common/templates/common/basic_setting.html:55
-#: common/templates/common/email_setting.html:56
-#: common/templates/common/ldap_setting.html:56
+#: common/templates/common/basic_setting.html:58
+#: common/templates/common/email_setting.html:59
+#: common/templates/common/ldap_setting.html:59
+#: common/templates/common/terminal_setting.html:82
 #: perms/templates/perms/asset_permission_create_update.html:67
-#: terminal/templates/terminal/terminal_update.html:45
+#: terminal/templates/terminal/terminal_update.html:46
 #: users/templates/users/_user.html:49
 #: users/templates/users/user_bulk_update.html:23
 #: users/templates/users/user_password_update.html:58
@@ -684,11 +690,12 @@ msgstr "重置"
 #: assets/templates/assets/asset_list.html:53
 #: assets/templates/assets/asset_update.html:56
 #: assets/templates/assets/cluster_create_update.html:55
-#: common/templates/common/basic_setting.html:56
-#: common/templates/common/email_setting.html:57
-#: common/templates/common/ldap_setting.html:57
+#: common/templates/common/basic_setting.html:59
+#: common/templates/common/email_setting.html:60
+#: common/templates/common/ldap_setting.html:60
+#: common/templates/common/terminal_setting.html:83
 #: perms/templates/perms/asset_permission_create_update.html:68
-#: terminal/templates/terminal/terminal_update.html:46
+#: terminal/templates/terminal/terminal_update.html:47
 #: users/templates/users/_user.html:50
 #: users/templates/users/first_login.html:62
 #: users/templates/users/forgot_password.html:44
@@ -778,6 +785,7 @@ msgstr "资产列表"
 #: assets/templates/assets/asset_group_detail.html:53
 #: assets/templates/assets/cluster_assets.html:54
 #: assets/templates/assets/user_asset_list.html:22
+#: common/templates/common/terminal_setting.html:63
 #: users/templates/users/login_log_list.html:50
 msgid "Type"
 msgstr "类型"
@@ -878,7 +886,7 @@ msgid "Group"
 msgstr "组"
 
 #: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:186
-#: assets/views/cluster.py:103
+#: assets/views/cluster.py:98
 msgid "Asset detail"
 msgstr "资产详情"
 
@@ -1236,16 +1244,16 @@ msgstr "已经存在"
 msgid "Cluster list"
 msgstr "集群列表"
 
-#: assets/views/cluster.py:42 assets/views/cluster.py:70
+#: assets/views/cluster.py:42 assets/views/cluster.py:65
 #: assets/views/system_user.py:96
 msgid "assets"
 msgstr "资产管理"
 
-#: assets/views/cluster.py:71
+#: assets/views/cluster.py:66
 msgid "Update Cluster"
 msgstr "更新Cluster"
 
-#: assets/views/cluster.py:86
+#: assets/views/cluster.py:81
 msgid "Cluster detail"
 msgstr "集群详情"
 
@@ -1291,85 +1299,108 @@ msgstr "<b>%(name)s</b> 创建成功"
 msgid "<b>%(name)s</b> was updated successfully"
 msgstr "<b>%(name)s</b> 更新成功"
 
-#: common/forms.py:64
+#: common/forms.py:70
 msgid "Current SITE URL"
 msgstr "当前站点URL"
 
-#: common/forms.py:68
+#: common/forms.py:74
 msgid "User Guide URL"
 msgstr "用户向导URL"
 
-#: common/forms.py:69
+#: common/forms.py:75
 msgid "User first login update profile done redirect to it"
 msgstr "用户第一次登录，修改profile后重定向到地址"
 
-#: common/forms.py:72
+#: common/forms.py:78
 msgid "Email Subject Prefix"
 msgstr "Email主题前缀"
 
-#: common/forms.py:76
-msgid "Enable LDAP Auth"
-msgstr "LDAP认证"
-
-#: common/forms.py:82
+#: common/forms.py:85
 msgid "SMTP host"
 msgstr "SMTP主机"
 
-#: common/forms.py:81
+#: common/forms.py:87
 msgid "SMTP port"
 msgstr "SMTP端口"
 
-#: common/forms.py:83
+#: common/forms.py:89
 msgid "SMTP user"
 msgstr "SMTP账号"
 
-#: common/forms.py:86
+#: common/forms.py:92
 msgid "SMTP password"
 msgstr "SMTP密码"
 
-#: common/forms.py:87
+#: common/forms.py:93
 msgid "Some provider use token except password"
 msgstr "一些邮件提供商需要输入的是Token"
 
-#: common/forms.py:90 common/forms.py:127
+#: common/forms.py:96 common/forms.py:133
 msgid "Use SSL"
 msgstr "使用SSL"
 
-#: common/forms.py:91
+#: common/forms.py:97
 msgid "If SMTP port is 465, may be select"
 msgstr "如果SMTP端口是465，通常需要启用SSL"
 
-#: common/forms.py:94
+#: common/forms.py:100
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: common/forms.py:95
+#: common/forms.py:101
 msgid "If SMTP port is 587, may be select"
 msgstr "如果SMTP端口是587，通常需要启用TLS"
 
-#: common/forms.py:101
+#: common/forms.py:107
 msgid "LDAP server"
 msgstr "LDAP地址"
 
-#: common/forms.py:104
+#: common/forms.py:110
 msgid "Bind DN"
 msgstr "绑定DN"
 
-#: common/forms.py:111
+#: common/forms.py:117
 msgid "User OU"
 msgstr "用户OU"
 
-#: common/forms.py:114
+#: common/forms.py:120
 msgid "User search filter"
 msgstr "用户过滤器"
 
-#: common/forms.py:117
+#: common/forms.py:123
 msgid "User attr map"
 msgstr "LDAP属性映射"
 
-#: common/forms.py:130
-msgid "Enable LDAP Auth"
-msgstr "开启LDAP认证"
+#: common/forms.py:143
+msgid "List sort by"
+msgstr "资产列表排序"
+
+#: common/forms.py:146
+msgid "Heartbeat interval"
+msgstr "心跳间隔"
+
+#: common/forms.py:146 ops/models.py:32
+msgid "Units: seconds"
+msgstr "单位: 秒"
+
+#: common/forms.py:149
+msgid "Password auth"
+msgstr "密码认证"
+
+#: common/forms.py:152
+msgid "Public key auth"
+msgstr "秘钥认证"
+
+#: common/forms.py:155 common/templates/common/terminal_setting.html:58
+#: terminal/models.py:27
+msgid "Command storage"
+msgstr "命令存储"
+
+#: common/forms.py:156
+msgid ""
+"Set terminal storage setting, `default` is the using as default,You can set "
+"other storage and some terminal using"
+msgstr "设置终端命令存储，default是默认用的存储方式"
 
 #: common/mixins.py:29
 msgid "is discard"
@@ -1379,43 +1410,62 @@ msgstr ""
 msgid "discard time"
 msgstr ""
 
-#: common/models.py:26
+#: common/models.py:27
 msgid "Value"
 msgstr "值"
 
-#: common/models.py:27
+#: common/models.py:29
 msgid "Enabled"
 msgstr "启用"
 
+#: common/templates/common/_add_terminal_command_storage_modal.html:4
+msgid "Add command storage"
+msgstr "添加命令存储"
+
 #: common/templates/common/basic_setting.html:15
 #: common/templates/common/email_setting.html:15
-#: common/templates/common/ldap_setting.html:15 common/views.py:18
+#: common/templates/common/ldap_setting.html:15
+#: common/templates/common/terminal_setting.html:15
+#: common/templates/common/terminal_setting.html:38 common/views.py:21
 msgid "Basic setting"
 msgstr "基本设置"
 
 #: common/templates/common/basic_setting.html:18
 #: common/templates/common/email_setting.html:18
-#: common/templates/common/ldap_setting.html:18 common/views.py:44
+#: common/templates/common/ldap_setting.html:18
+#: common/templates/common/terminal_setting.html:18 common/views.py:47
 msgid "Email setting"
 msgstr "邮件设置"
 
 #: common/templates/common/basic_setting.html:21
 #: common/templates/common/email_setting.html:21
-#: common/templates/common/ldap_setting.html:21 common/views.py:70
+#: common/templates/common/ldap_setting.html:21
+#: common/templates/common/terminal_setting.html:21 common/views.py:73
 msgid "LDAP setting"
 msgstr "LDAP设置"
 
-#: common/templates/common/email_setting.html:55
-#: common/templates/common/ldap_setting.html:55
+#: common/templates/common/basic_setting.html:24
+#: common/templates/common/email_setting.html:24
+#: common/templates/common/ldap_setting.html:24
+#: common/templates/common/terminal_setting.html:24 common/views.py:102
+msgid "Terminal setting"
+msgstr "终端设置"
+
+#: common/templates/common/email_setting.html:58
+#: common/templates/common/ldap_setting.html:58
 msgid "Test connection"
 msgstr "测试连接"
 
-#: common/views.py:17 common/views.py:43 common/views.py:69
+#: common/templates/common/terminal_setting.html:77 terminal/models.py:28
+msgid "Replay storage"
+msgstr "录像存储"
+
+#: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:101
 #: templates/_nav.html:69
 msgid "Settings"
 msgstr "系统设置"
 
-#: common/views.py:28 common/views.py:54 common/views.py:82
+#: common/views.py:31 common/views.py:57 common/views.py:85 common/views.py:113
 msgid "Update setting successfully, please restart program"
 msgstr "更新设置成功, 请手动重启程序"
 
@@ -1423,10 +1473,6 @@ msgstr "更新设置成功, 请手动重启程序"
 msgid "Interval"
 msgstr "间隔"
 
-#: ops/models.py:32
-msgid "Units: seconds"
-msgstr "单位: 秒"
-
 #: ops/models.py:33
 msgid "Crontab"
 msgstr "Crontab"
@@ -1570,7 +1616,7 @@ msgstr "执行历史"
 
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:58
-#: ops/templates/ops/task_history.html:55 terminal/models.py:101
+#: ops/templates/ops/task_history.html:55 terminal/models.py:132
 #: terminal/templates/terminal/session_list.html:77
 msgid "Date start"
 msgstr "开始日期"
@@ -1687,18 +1733,18 @@ msgid "Task run history"
 msgstr "执行历史"
 
 #: perms/forms.py:16 users/forms.py:147 users/forms.py:152 users/forms.py:164
-#: users/forms.py:195
+#: users/forms.py:194
 msgid "Select users"
 msgstr "选择用户"
 
 #: perms/forms.py:18 perms/models.py:15
 #: perms/templates/perms/asset_permission_create_update.html:36
 #: perms/templates/perms/asset_permission_list.html:26 templates/_nav.html:12
-#: terminal/backends/command/models.py:10 terminal/models.py:92
+#: terminal/backends/command/models.py:10 terminal/models.py:123
 #: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
-#: terminal/templates/terminal/session_list.html:71 users/forms.py:191
+#: terminal/templates/terminal/session_list.html:71 users/forms.py:190
 #: users/models/user.py:30 users/templates/users/user_group_detail.html:78
 #: users/views/user.py:337
 msgid "User"
@@ -1953,7 +1999,7 @@ msgstr "在线会话"
 msgid "Session offline"
 msgstr "离线会话"
 
-#: templates/_nav.html:53 terminal/models.py:99
+#: templates/_nav.html:53 terminal/models.py:130
 #: terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
@@ -2002,56 +2048,56 @@ msgstr "SSH 监听端口"
 msgid "Coco http/ws listen port"
 msgstr "Http/Websocket 监听端口"
 
-#: terminal/models.py:15
+#: terminal/models.py:24
 msgid "Remote Address"
 msgstr "远端地址"
 
-#: terminal/models.py:16
+#: terminal/models.py:25
 msgid "SSH Port"
 msgstr "SSH端口"
 
-#: terminal/models.py:17
+#: terminal/models.py:26
 msgid "HTTP Port"
 msgstr "HTTP端口"
 
-#: terminal/models.py:68
+#: terminal/models.py:99
 msgid "Session Online"
 msgstr "在线会话"
 
-#: terminal/models.py:69
+#: terminal/models.py:100
 msgid "CPU Usage"
 msgstr "CPU使用"
 
-#: terminal/models.py:70
+#: terminal/models.py:101
 msgid "Memory Used"
 msgstr "内存使用"
 
-#: terminal/models.py:71
+#: terminal/models.py:102
 msgid "Connections"
 msgstr "连接数"
 
-#: terminal/models.py:72
+#: terminal/models.py:103
 msgid "Threads"
 msgstr "线程数"
 
-#: terminal/models.py:73
+#: terminal/models.py:104
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:96 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:127 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
 
-#: terminal/models.py:98 terminal/templates/terminal/session_list.html:100
+#: terminal/models.py:129 terminal/templates/terminal/session_list.html:100
 msgid "Replay"
 msgstr "回放"
 
-#: terminal/models.py:102
+#: terminal/models.py:133
 msgid "Date end"
 msgstr "结束日期"
 
-#: terminal/models.py:119
+#: terminal/models.py:150
 msgid "Args"
 msgstr "参数"
 
@@ -2814,5 +2860,8 @@ msgstr "密码更新"
 msgid "Public key update"
 msgstr "秘钥更新"
 
+#~ msgid "Enable LDAP Auth"
+#~ msgstr "LDAP认证"
+
 #~ msgid "Connect"
 #~ msgstr "连接"
diff --git a/apps/users/forms.py b/apps/users/forms.py
index 018c39a18..b239f58ee 100644
--- a/apps/users/forms.py
+++ b/apps/users/forms.py
@@ -172,7 +172,6 @@ class UserBulkUpdateForm(forms.ModelForm):
             if self.data.get(field) is not None:
                 changed_fields.append(field)
 
-        print(changed_fields)
         cleaned_data = {k: v for k, v in self.cleaned_data.items()
                         if k in changed_fields}
         users = cleaned_data.pop('users', '')