From f7ab13952e0c783e81e06602c42c4e774cad9d61 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Fri, 2 Mar 2018 09:36:17 +0800
Subject: [PATCH] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8Dbug=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9celery=20beat=E7=89=88=E6=9C=AC=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/templates/assets/_system_user.html |  22 ++
 apps/i18n/zh/LC_MESSAGES/django.mo            | Bin 29645 -> 29707 bytes
 apps/i18n/zh/LC_MESSAGES/django.po            | 309 +++++++++---------
 apps/jumpserver/views.py                      |   3 +-
 apps/perms/serializers.py                     |   2 +-
 apps/templates/_header_bar.html               |   7 +-
 apps/templates/index.html                     |   2 +-
 requirements/requirements.txt                 |   4 +-
 8 files changed, 194 insertions(+), 155 deletions(-)

diff --git a/apps/assets/templates/assets/_system_user.html b/apps/assets/templates/assets/_system_user.html
index fe06a6fc7..358f7dd5e 100644
--- a/apps/assets/templates/assets/_system_user.html
+++ b/apps/assets/templates/assets/_system_user.html
@@ -81,6 +81,14 @@
 {% block custom_foot_js %}
     <script>
         var auto_generate_key = '#'+'{{ form.auto_generate_key.id_for_label }}';
+        var protocol_id = '#' + '{{ form.protocol.id_for_label }}';
+        var password_id = '#' + '{{ form.password.id_for_label }}';
+        var private_key_id = '#' + '{{ form.private_key_file.id_for_label }}';
+        var sudo_id = '#' + '{{ form.sudo.id_for_label }}';
+        var shell_id = '#' + '{{ form.shell.id_for_label }}';
+
+        var need_change_field = [auto_generate_key, private_key_id, sudo_id, shell_id] ;
+
         function authFieldsDisplay() {
             if ($(auto_generate_key).prop('checked')) {
                 $('.auth-fields').addClass('hidden');
@@ -88,9 +96,23 @@
                 $('.auth-fields').removeClass('hidden');
             }
         }
+
+        function protocolChange() {
+            if ($(protocol_id).attr('value') === 'rdp') {
+                $.each(need_change_field, function (index, value) {
+                    $(value).addClass('hidden')
+                });
+                $(password_id).removeClass('hidden')
+            } else {
+                $.each(need_change_field, function (index, value) {
+                    $(value).removeClass('hidden')
+                });
+            }
+        }
         $(document).ready(function () {
             $('.select2').select2();
             authFieldsDisplay();
+            protocolChange();
             $(auto_generate_key).change(function () {
                 authFieldsDisplay();
             });
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo
index c38fdb5c95de35a3b356c579efeb49a768e2b168..0f8484c1f0472e1e1fa8c24c510a58fd62f8b3de 100644
GIT binary patch
delta 10569
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
be#_tg_KfkjHqN;-{p&kfW3s!XW%&LdphT3p

delta 10523
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

diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 0a839e612..792cb9195 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/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-02-26 16:54+0800\n"
+"POT-Creation-Date: 2018-03-01 15:29+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"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: assets/api/node.py:54
+#: assets/api/node.py:55
 msgid "New node {}"
 msgstr "新节点 {}"
 
 #: assets/forms/asset.py:23 assets/forms/asset.py:52 assets/forms/user.py:125
-#: assets/models/asset.py:45 assets/models/user.py:221
+#: assets/models/asset.py:53 assets/models/user.py:218
 #: assets/templates/assets/asset_detail.html:181
 #: assets/templates/assets/asset_detail.html:189
 #: assets/templates/assets/system_user_detail.html:164
@@ -30,16 +30,16 @@ msgid "Nodes"
 msgstr "节点管理"
 
 #: assets/forms/asset.py:26 assets/forms/asset.py:55 assets/forms/asset.py:90
-#: assets/forms/asset.py:94 assets/models/asset.py:49
-#: assets/models/cluster.py:19 assets/models/user.py:190
-#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:23
+#: assets/forms/asset.py:94 assets/models/asset.py:57
+#: assets/models/cluster.py:19 assets/models/user.py:187
+#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/models/asset.py:73
-#: assets/templates/assets/asset_create.html:31
+#: assets/forms/asset.py:29 assets/forms/asset.py:58 assets/models/asset.py:81
+#: assets/templates/assets/asset_create.html:32
 #: assets/templates/assets/asset_detail.html:218
-#: assets/templates/assets/asset_update.html:36 templates/_nav.html:25
+#: assets/templates/assets/asset_update.html:37 templates/_nav.html:26
 msgid "Labels"
 msgstr "标签管理"
 
@@ -54,7 +54,7 @@ msgstr "管理用户是资产上已经存在的特权用户，如 root或者其
 msgid "Select assets"
 msgstr "选择资产"
 
-#: assets/forms/asset.py:86 assets/models/asset.py:44
+#: assets/forms/asset.py:86 assets/models/asset.py:52
 #: assets/templates/assets/admin_user_assets.html:53
 #: assets/templates/assets/asset_detail.html:69
 #: assets/templates/assets/system_user_asset.html:51
@@ -62,7 +62,7 @@ msgstr "选择资产"
 msgid "Port"
 msgstr "端口"
 
-#: assets/forms/asset.py:106 assets/templates/assets/asset_create.html:35
+#: assets/forms/asset.py:106 assets/templates/assets/asset_create.html:36
 msgid "Select labels"
 msgstr "选择标签"
 
@@ -70,11 +70,11 @@ msgstr "选择标签"
 msgid "Select nodes"
 msgstr "选择节点"
 
-#: assets/forms/label.py:13 assets/models/asset.py:137
+#: assets/forms/label.py:13 assets/models/asset.py:153
 #: assets/templates/assets/admin_user_list.html:24
 #: assets/templates/assets/label_list.html:16
 #: assets/templates/assets/system_user_list.html:26 perms/models.py:17
-#: terminal/backends/command/models.py:11 terminal/models.py:116
+#: terminal/backends/command/models.py:11 terminal/models.py:123
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -116,11 +116,11 @@ msgstr "密码和私钥, 必须输入一个"
 #: assets/templates/assets/system_user_detail.html:58
 #: assets/templates/assets/system_user_list.html:24 common/models.py:26
 #: common/templates/common/terminal_setting.html:67
-#: common/templates/common/terminal_setting.html:88 ops/models.py:31
+#: common/templates/common/terminal_setting.html:85 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_detail.html:62
-#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:15
-#: terminal/models.py:141 terminal/templates/terminal/terminal_detail.html:43
+#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:16
+#: 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:63
@@ -162,7 +162,7 @@ msgid ""
 "than 2 system user"
 msgstr "高优先级的系统用户将会作为默认登录用户"
 
-#: assets/models/asset.py:42 assets/templates/assets/_asset_list_modal.html:21
+#: assets/models/asset.py:50 assets/templates/assets/_asset_list_modal.html:21
 #: assets/templates/assets/admin_user_assets.html:52
 #: assets/templates/assets/asset_detail.html:61
 #: assets/templates/assets/asset_list.html:81
@@ -175,7 +175,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户"
 msgid "IP"
 msgstr "IP"
 
-#: assets/models/asset.py:43 assets/templates/assets/_asset_list_modal.html:20
+#: assets/models/asset.py:51 assets/templates/assets/_asset_list_modal.html:20
 #: assets/templates/assets/admin_user_assets.html:51
 #: assets/templates/assets/asset_detail.html:57
 #: assets/templates/assets/asset_list.html:80
@@ -187,77 +187,77 @@ msgstr "IP"
 msgid "Hostname"
 msgstr "主机名"
 
-#: assets/models/asset.py:46 assets/models/label.py:20
+#: assets/models/asset.py:54 assets/models/label.py:20
 #: assets/templates/assets/asset_detail.html:105
 #: perms/templates/perms/asset_permission_list.html:70
 msgid "Is active"
 msgstr "激活"
 
-#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:65
+#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:65
 msgid "Public IP"
 msgstr "公网IP"
 
-#: assets/models/asset.py:53 assets/templates/assets/asset_detail.html:113
+#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:113
 msgid "Asset number"
 msgstr "资产编号"
 
-#: assets/models/asset.py:56 assets/templates/assets/asset_detail.html:77
+#: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:77
 msgid "Vendor"
 msgstr "制造商"
 
-#: assets/models/asset.py:57 assets/templates/assets/asset_detail.html:81
+#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:81
 msgid "Model"
 msgstr "型号"
 
-#: assets/models/asset.py:58 assets/templates/assets/asset_detail.html:109
+#: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:109
 msgid "Serial number"
 msgstr "序列号"
 
-#: assets/models/asset.py:60
+#: assets/models/asset.py:68
 msgid "CPU model"
 msgstr "CPU型号"
 
-#: assets/models/asset.py:61
+#: assets/models/asset.py:69
 msgid "CPU count"
 msgstr "CPU数量"
 
-#: assets/models/asset.py:62
+#: assets/models/asset.py:70
 msgid "CPU cores"
 msgstr "CPU核数"
 
-#: assets/models/asset.py:63 assets/templates/assets/asset_detail.html:89
+#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:89
 msgid "Memory"
 msgstr "内存"
 
-#: assets/models/asset.py:64
+#: assets/models/asset.py:72
 msgid "Disk total"
 msgstr "硬盘大小"
 
-#: assets/models/asset.py:65
+#: assets/models/asset.py:73
 msgid "Disk info"
 msgstr "硬盘信息"
 
-#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:97
+#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:97
 msgid "Platform"
 msgstr "系统平台"
 
-#: assets/models/asset.py:68 assets/templates/assets/asset_detail.html:101
+#: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:101
 msgid "OS"
 msgstr "操作系统"
 
-#: assets/models/asset.py:69
+#: assets/models/asset.py:77
 msgid "OS version"
 msgstr "系统版本"
 
-#: assets/models/asset.py:70
+#: assets/models/asset.py:78
 msgid "OS arch"
 msgstr "系统架构"
 
-#: assets/models/asset.py:71
+#: assets/models/asset.py:79
 msgid "Hostname raw"
 msgstr "主机名原始"
 
-#: assets/models/asset.py:74 assets/models/cluster.py:28
+#: assets/models/asset.py:82 assets/models/cluster.py:28
 #: assets/models/group.py:21 assets/models/user.py:36
 #: assets/templates/assets/admin_user_detail.html:68
 #: assets/templates/assets/asset_detail.html:117
@@ -268,7 +268,7 @@ msgstr "主机名原始"
 msgid "Created by"
 msgstr "创建者"
 
-#: assets/models/asset.py:75 assets/models/cluster.py:26
+#: assets/models/asset.py:83 assets/models/cluster.py:26
 #: assets/models/group.py:22 assets/models/label.py:23
 #: assets/templates/assets/admin_user_detail.html:64
 #: assets/templates/assets/system_user_detail.html:92
@@ -280,7 +280,7 @@ msgstr "创建者"
 msgid "Date created"
 msgstr "创建日期"
 
-#: assets/models/asset.py:76 assets/models/cluster.py:29
+#: assets/models/asset.py:84 assets/models/cluster.py:29
 #: assets/models/group.py:23 assets/models/label.py:21 assets/models/user.py:33
 #: assets/templates/assets/admin_user_detail.html:72
 #: assets/templates/assets/admin_user_list.html:28
@@ -288,7 +288,7 @@ msgstr "创建日期"
 #: assets/templates/assets/system_user_detail.html:100
 #: assets/templates/assets/system_user_list.html:30 common/models.py:30
 #: ops/models.py:37 perms/models.py:24 perms/models.py:81
-#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:25
+#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:26
 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
 #: users/models/user.py:47 users/templates/users/user_detail.html:111
 #: users/templates/users/user_group_detail.html:67
@@ -331,7 +331,7 @@ msgid "Default"
 msgstr "默认"
 
 #: assets/models/cluster.py:36 assets/models/label.py:13
-#: users/models/user.py:261
+#: users/models/user.py:265
 msgid "System"
 msgstr "系统"
 
@@ -352,13 +352,13 @@ msgid "Default asset group"
 msgstr "默认资产组"
 
 #: assets/models/label.py:14 perms/models.py:15
-#: terminal/backends/command/models.py:10 terminal/models.py:115
+#: terminal/backends/command/models.py:10 terminal/models.py:122
 #: 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:190
 #: users/models/user.py:30 users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:13 users/views/user.py:330
+#: users/templates/users/user_group_list.html:13 users/views/user.py:334
 msgid "User"
 msgstr "用户"
 
@@ -383,32 +383,32 @@ msgstr "ssh密钥"
 msgid "SSH public key"
 msgstr "ssh公钥"
 
-#: assets/models/user.py:222
+#: assets/models/user.py:219
 msgid "Priority"
 msgstr "优先级"
 
-#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:66
+#: assets/models/user.py:220 assets/templates/assets/system_user_detail.html:66
 msgid "Protocol"
 msgstr "协议"
 
-#: assets/models/user.py:224 assets/templates/assets/_system_user.html:58
+#: assets/models/user.py:221 assets/templates/assets/_system_user.html:58
 #: assets/templates/assets/system_user_detail.html:118
 #: assets/templates/assets/system_user_update.html:11
 msgid "Auto push"
 msgstr "自动推送"
 
-#: assets/models/user.py:225 assets/templates/assets/system_user_detail.html:70
+#: assets/models/user.py:222 assets/templates/assets/system_user_detail.html:70
 msgid "Sudo"
 msgstr "Sudo"
 
-#: assets/models/user.py:226 assets/templates/assets/system_user_detail.html:75
+#: assets/models/user.py:223 assets/templates/assets/system_user_detail.html:75
 msgid "Shell"
 msgstr "Shell"
 
-#: assets/models/user.py:269 perms/forms.py:25 perms/models.py:19
+#: assets/models/user.py:266 perms/forms.py:25 perms/models.py:19
 #: perms/models.py:76 perms/templates/perms/asset_permission_detail.html:136
-#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:24
-#: terminal/backends/command/models.py:12 terminal/models.py:117
+#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:25
+#: terminal/backends/command/models.py:12 terminal/models.py:124
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -479,7 +479,7 @@ msgstr "仅修改你需要更新的字段"
 #: assets/views/label.py:42 assets/views/label.py:58
 #: assets/views/system_user.py:28 assets/views/system_user.py:44
 #: assets/views/system_user.py:60 assets/views/system_user.py:74
-#: templates/_nav.html:19
+#: templates/_nav.html:20
 msgid "Assets"
 msgstr "资产管理"
 
@@ -564,7 +564,7 @@ msgstr "可连接"
 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:61
 #: ops/templates/ops/task_history.html:62 ops/templates/ops/task_list.html:41
 #: perms/templates/perms/asset_permission_list.html:72
-#: terminal/templates/terminal/session_list.html:79
+#: terminal/templates/terminal/session_list.html:80
 #: terminal/templates/terminal/terminal_list.html:36
 #: users/templates/users/user_group_list.html:15
 #: users/templates/users/user_list.html:28
@@ -599,16 +599,16 @@ msgstr "激活所选"
 #: assets/templates/assets/_system_user.html:71
 #: assets/templates/assets/admin_user_create_update.html:46
 #: assets/templates/assets/asset_bulk_update.html:24
-#: assets/templates/assets/asset_create.html:65
+#: assets/templates/assets/asset_create.html:66
 #: assets/templates/assets/asset_list.html:102
-#: assets/templates/assets/asset_update.html:69
+#: assets/templates/assets/asset_update.html:70
 #: assets/templates/assets/label_create_update.html:17
 #: 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:108
+#: common/templates/common/terminal_setting.html:103
 #: perms/templates/perms/asset_permission_create_update.html:72
-#: terminal/templates/terminal/terminal_update.html:47
+#: terminal/templates/terminal/terminal_update.html:48
 #: users/templates/users/_user.html:44
 #: users/templates/users/first_login.html:62
 #: users/templates/users/forgot_password.html:44
@@ -673,8 +673,8 @@ msgid "Basic"
 msgstr "基本"
 
 #: assets/templates/assets/_system_user.html:44
-#: assets/templates/assets/asset_create.html:23
-#: assets/templates/assets/asset_update.html:28
+#: assets/templates/assets/asset_create.html:24
+#: assets/templates/assets/asset_update.html:29
 #: assets/templates/assets/system_user_update.html:7
 #: users/templates/users/user_create.html:9
 #: users/templates/users/user_update.html:6
@@ -686,25 +686,25 @@ msgid "Auto generate key"
 msgstr "自动生成秘钥"
 
 #: assets/templates/assets/_system_user.html:64
-#: assets/templates/assets/asset_create.html:57
-#: assets/templates/assets/asset_update.html:61
+#: assets/templates/assets/asset_create.html:58
+#: assets/templates/assets/asset_update.html:62
 #: perms/templates/perms/asset_permission_create_update.html:49
-#: terminal/templates/terminal/terminal_update.html:41
+#: terminal/templates/terminal/terminal_update.html:42
 msgid "Other"
 msgstr "其它"
 
 #: assets/templates/assets/_system_user.html:70
 #: assets/templates/assets/admin_user_create_update.html:45
 #: assets/templates/assets/asset_bulk_update.html:23
-#: assets/templates/assets/asset_create.html:64
-#: assets/templates/assets/asset_update.html:68
+#: assets/templates/assets/asset_create.html:65
+#: assets/templates/assets/asset_update.html:69
 #: assets/templates/assets/label_create_update.html:16
 #: 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:106
+#: common/templates/common/terminal_setting.html:101
 #: perms/templates/perms/asset_permission_create_update.html:71
-#: terminal/templates/terminal/terminal_update.html:46
+#: terminal/templates/terminal/terminal_update.html:47
 #: users/templates/users/_user.html:43
 #: users/templates/users/user_bulk_update.html:23
 #: users/templates/users/user_password_update.html:58
@@ -773,7 +773,7 @@ msgstr "替换资产的管理员"
 
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:198
-#: assets/templates/assets/asset_list.html:482
+#: assets/templates/assets/asset_list.html:535
 #: assets/templates/assets/system_user_detail.html:181
 #: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16
 #: terminal/templates/terminal/session_detail.html:108
@@ -799,16 +799,16 @@ msgstr "不可达"
 msgid "Ratio"
 msgstr "比例"
 
-#: assets/templates/assets/asset_create.html:27
-#: assets/templates/assets/asset_update.html:32 perms/models.py:74
+#: assets/templates/assets/asset_create.html:28
+#: assets/templates/assets/asset_update.html:33 perms/models.py:74
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:67
 msgid "Node"
 msgstr "节点"
 
-#: assets/templates/assets/asset_create.html:33
+#: assets/templates/assets/asset_create.html:34
 #: assets/templates/assets/asset_list.html:69
-#: assets/templates/assets/asset_update.html:38
+#: assets/templates/assets/asset_update.html:39
 msgid "Label"
 msgstr "标签"
 
@@ -893,7 +893,7 @@ msgstr "创建节点失败"
 msgid "Have child node, cancel"
 msgstr "存在子节点，不能删除"
 
-#: assets/templates/assets/asset_list.html:477
+#: assets/templates/assets/asset_list.html:530
 #: assets/templates/assets/system_user_list.html:130
 #: users/templates/users/user_detail.html:334
 #: users/templates/users/user_detail.html:359
@@ -902,24 +902,24 @@ msgstr "存在子节点，不能删除"
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:478
+#: assets/templates/assets/asset_list.html:531
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:486
+#: assets/templates/assets/asset_list.html:539
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:487
-#: assets/templates/assets/asset_list.html:492
+#: assets/templates/assets/asset_list.html:540
+#: assets/templates/assets/asset_list.html:545
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:491
+#: assets/templates/assets/asset_list.html:544
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
-#: assets/templates/assets/asset_update.html:57
+#: assets/templates/assets/asset_update.html:58
 msgid "Configuration"
 msgstr "配置"
 
@@ -1011,7 +1011,7 @@ msgstr "更新管理用户"
 msgid "Admin user detail"
 msgstr "管理用户详情"
 
-#: assets/views/asset.py:49 assets/views/asset.py:62 templates/_nav.html:22
+#: assets/views/asset.py:49 assets/views/asset.py:62 templates/_nav.html:23
 msgid "Asset list"
 msgstr "资产列表"
 
@@ -1023,7 +1023,7 @@ msgstr "批量更新资产"
 msgid "Update asset"
 msgstr "编辑资产"
 
-#: assets/views/asset.py:296
+#: assets/views/asset.py:297
 msgid "already exists"
 msgstr "已经存在"
 
@@ -1195,7 +1195,7 @@ msgid "Public key auth"
 msgstr "秘钥认证"
 
 #: common/forms.py:159 common/templates/common/terminal_setting.html:63
-#: terminal/forms.py:21 terminal/models.py:19
+#: terminal/forms.py:30 terminal/models.py:20
 msgid "Command storage"
 msgstr "命令存储"
 
@@ -1205,8 +1205,8 @@ msgid ""
 "other storage and some terminal using"
 msgstr "设置终端命令存储，default是默认用的存储方式"
 
-#: common/forms.py:165 common/templates/common/terminal_setting.html:84
-#: terminal/models.py:20
+#: common/forms.py:165 common/templates/common/terminal_setting.html:81
+#: terminal/forms.py:34 terminal/models.py:21
 msgid "Replay storage"
 msgstr "录像存储"
 
@@ -1263,19 +1263,13 @@ msgid "Test connection"
 msgstr "测试连接"
 
 #: common/templates/common/terminal_setting.html:68
-#: common/templates/common/terminal_setting.html:89
+#: common/templates/common/terminal_setting.html:86
 #: users/templates/users/login_log_list.html:50
 msgid "Type"
 msgstr "类型"
 
-#: common/templates/common/terminal_setting.html:90
-#: users/templates/users/reset_password.html:57
-#: users/templates/users/user_profile.html:20
-msgid "Setting"
-msgstr "设置"
-
 #: common/views.py:20 common/views.py:46 common/views.py:72 common/views.py:102
-#: templates/_nav.html:66
+#: templates/_nav.html:67
 msgid "Settings"
 msgstr "系统设置"
 
@@ -1430,7 +1424,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:124
+#: ops/templates/ops/task_history.html:55 terminal/models.py:132
 #: terminal/templates/terminal/session_list.html:77
 msgid "Date start"
 msgstr "开始日期"
@@ -1542,7 +1536,7 @@ msgstr "任务开始: "
 msgid "Ops"
 msgstr "作业中心"
 
-#: ops/views.py:37 templates/_nav.html:52
+#: ops/views.py:37 templates/_nav.html:53
 msgid "Task list"
 msgstr "任务列表"
 
@@ -1551,7 +1545,7 @@ msgid "Task run history"
 msgstr "执行历史"
 
 #: perms/forms.py:22 perms/models.py:16 perms/models.py:75
-#: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:13
+#: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:14
 #: users/models/user.py:37 users/templates/users/_select_user_modal.html:16
 #: users/templates/users/user_detail.html:179
 #: users/templates/users/user_list.html:26
@@ -1566,7 +1560,7 @@ msgstr "用户组"
 msgid "Date expired"
 msgstr "失效日期"
 
-#: perms/models.py:88 templates/_nav.html:32
+#: perms/models.py:88 templates/_nav.html:33
 msgid "Asset permission"
 msgstr "资产授权"
 
@@ -1660,7 +1654,7 @@ msgstr "添加用户组"
 msgid "Select user groups"
 msgstr "选择用户组"
 
-#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:29
+#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:30
 msgid "Perms"
 msgstr "权限管理"
 
@@ -1677,37 +1671,41 @@ msgid "Update asset permission"
 msgstr "更新资产授权"
 
 #: templates/_header_bar.html:18
-msgid "Help"
-msgstr "帮助"
+msgid "Supports"
+msgstr "商业支持"
 
-#: templates/_header_bar.html:32 templates/_nav_user.html:9
+#: templates/_header_bar.html:23
+msgid "Docs"
+msgstr "文档"
+
+#: templates/_header_bar.html:37 templates/_nav_user.html:9
 #: users/templates/users/_user.html:36
 #: users/templates/users/user_password_update.html:37
 #: users/templates/users/user_profile.html:17
 #: users/templates/users/user_profile_update.html:37
 #: users/templates/users/user_profile_update.html:57
-#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:313
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:317
 msgid "Profile"
 msgstr "个人信息"
 
-#: templates/_header_bar.html:36
+#: templates/_header_bar.html:41
 msgid "Admin page"
 msgstr "管理页面"
 
-#: templates/_header_bar.html:38
+#: templates/_header_bar.html:43
 msgid "User page"
 msgstr "用户页面"
 
-#: templates/_header_bar.html:41
+#: templates/_header_bar.html:46
 msgid "Logout"
 msgstr "注销登录"
 
-#: templates/_header_bar.html:45 users/templates/users/login.html:42
+#: templates/_header_bar.html:50 users/templates/users/login.html:42
 #: users/templates/users/login.html:61
 msgid "Login"
 msgstr "登录"
 
-#: templates/_header_bar.html:58 templates/_nav.html:4
+#: templates/_header_bar.html:63 templates/_nav.html:4
 msgid "Dashboard"
 msgstr "仪表盘"
 
@@ -1741,39 +1739,39 @@ msgstr ""
 msgid "Close"
 msgstr "关闭"
 
-#: templates/_nav.html:9 users/views/group.py:28 users/views/group.py:44
+#: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44
 #: users/views/group.py:62 users/views/group.py:79 users/views/login.py:200
-#: users/views/login.py:249 users/views/user.py:57 users/views/user.py:72
-#: users/views/user.py:91 users/views/user.py:147 users/views/user.py:300
-#: users/views/user.py:312 users/views/user.py:348 users/views/user.py:370
+#: users/views/login.py:249 users/views/user.py:59 users/views/user.py:74
+#: users/views/user.py:93 users/views/user.py:149 users/views/user.py:304
+#: users/views/user.py:316 users/views/user.py:352 users/views/user.py:374
 msgid "Users"
 msgstr "用户管理"
 
-#: templates/_nav.html:12 users/views/user.py:58
+#: templates/_nav.html:13 users/views/user.py:60
 msgid "User list"
 msgstr "用户列表"
 
-#: templates/_nav.html:14
+#: templates/_nav.html:15
 msgid "Login logs"
 msgstr "登录日志"
 
-#: templates/_nav.html:38
+#: templates/_nav.html:39
 msgid "Sessions"
 msgstr "会话管理"
 
-#: templates/_nav.html:41
+#: templates/_nav.html:42
 msgid "Session online"
 msgstr "在线会话"
 
-#: templates/_nav.html:42
+#: templates/_nav.html:43
 msgid "Session offline"
 msgstr "历史会话"
 
-#: templates/_nav.html:43
+#: templates/_nav.html:44
 msgid "Commands"
 msgstr "命令记录"
 
-#: templates/_nav.html:44 terminal/templates/terminal/session_list.html:75
+#: templates/_nav.html:45 terminal/templates/terminal/session_list.html:75
 #: terminal/views/command.py:47 terminal/views/session.py:75
 #: terminal/views/session.py:92 terminal/views/session.py:114
 #: terminal/views/terminal.py:31 terminal/views/terminal.py:46
@@ -1781,7 +1779,7 @@ msgstr "命令记录"
 msgid "Terminal"
 msgstr "终端管理"
 
-#: templates/_nav.html:49
+#: templates/_nav.html:50
 msgid "Job Center"
 msgstr "作业中心"
 
@@ -1819,71 +1817,77 @@ msgstr "输出"
 msgid "Session"
 msgstr "会话"
 
-#: terminal/forms.py:27
+#: terminal/forms.py:44
 msgid "Coco ssh listen port"
 msgstr "SSH 监听端口"
 
-#: terminal/forms.py:28
+#: terminal/forms.py:45
 msgid "Coco http/ws listen port"
 msgstr "Http/Websocket 监听端口"
 
-#: terminal/models.py:16
+#: terminal/models.py:17
 msgid "Remote Address"
 msgstr "远端地址"
 
-#: terminal/models.py:17
+#: terminal/models.py:18
 msgid "SSH Port"
 msgstr "SSH端口"
 
-#: terminal/models.py:18
+#: terminal/models.py:19
 msgid "HTTP Port"
 msgstr "HTTP端口"
 
-#: terminal/models.py:91
+#: terminal/models.py:98
 msgid "Session Online"
 msgstr "在线会话"
 
-#: terminal/models.py:92
+#: terminal/models.py:99
 msgid "CPU Usage"
 msgstr "CPU使用"
 
-#: terminal/models.py:93
+#: terminal/models.py:100
 msgid "Memory Used"
 msgstr "内存使用"
 
-#: terminal/models.py:94
+#: terminal/models.py:101
 msgid "Connections"
 msgstr "连接数"
 
-#: terminal/models.py:95
+#: terminal/models.py:102
 msgid "Threads"
 msgstr "线程数"
 
-#: terminal/models.py:96
+#: terminal/models.py:103
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:119 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:126 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
 
-#: terminal/models.py:121 terminal/templates/terminal/session_list.html:100
+#: terminal/models.py:128 terminal/templates/terminal/session_list.html:102
 msgid "Replay"
 msgstr "回放"
 
-#: terminal/models.py:122 terminal/templates/terminal/command_list.html:55
+#: terminal/models.py:129 terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
 #: terminal/templates/terminal/session_list.html:76
 msgid "Command"
 msgstr "命令"
 
-#: terminal/models.py:125
+#: terminal/models.py:131
+#, fuzzy
+#| msgid "Date start"
+msgid "Date last active"
+msgstr "开始日期"
+
+#: terminal/models.py:133
 msgid "Date end"
 msgstr "结束日期"
 
-#: terminal/models.py:142
+#: terminal/models.py:150
 msgid "Args"
 msgstr "参数"
 
@@ -1922,19 +1926,19 @@ msgstr "监控"
 msgid "Terminate session"
 msgstr "终止会话"
 
-#: terminal/templates/terminal/session_list.html:78
+#: terminal/templates/terminal/session_list.html:79
 msgid "Duration"
 msgstr "时长"
 
-#: terminal/templates/terminal/session_list.html:102
+#: terminal/templates/terminal/session_list.html:104
 msgid "Monitor"
 msgstr "监控"
 
-#: terminal/templates/terminal/session_list.html:103
+#: terminal/templates/terminal/session_list.html:105
 msgid "Terminate"
 msgstr "终断"
 
-#: terminal/templates/terminal/session_list.html:119
+#: terminal/templates/terminal/session_list.html:121
 msgid "Terminate task send, waiting ..."
 msgstr "终断任务已发送，请等待"
 
@@ -2129,7 +2133,7 @@ msgstr "Agent"
 msgid "Date login"
 msgstr "登录日期"
 
-#: users/models/user.py:29 users/models/user.py:257
+#: users/models/user.py:29 users/models/user.py:261
 msgid "Administrator"
 msgstr "管理员"
 
@@ -2168,7 +2172,7 @@ msgstr "二次验证"
 msgid "Public key"
 msgstr "ssh公钥"
 
-#: users/models/user.py:260
+#: users/models/user.py:264
 msgid "Administrator is the super user of system"
 msgstr "Administrator是初始的超级管理员"
 
@@ -2269,8 +2273,13 @@ msgstr "重置密码"
 msgid "Password again"
 msgstr "再次输入密码"
 
+#: users/templates/users/reset_password.html:57
+#: users/templates/users/user_profile.html:20
+msgid "Setting"
+msgstr "设置"
+
 #: users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:16 users/views/user.py:72
+#: users/templates/users/user_list.html:16 users/views/user.py:74
 msgid "Create user"
 msgstr "创建用户"
 
@@ -2279,7 +2288,7 @@ msgid "Reset link will be generated and sent to the user. "
 msgstr "生成重置密码连接，通过邮件发送给用户"
 
 #: users/templates/users/user_detail.html:19
-#: users/templates/users/user_granted_asset.html:18 users/views/user.py:148
+#: users/templates/users/user_granted_asset.html:18 users/views/user.py:150
 msgid "User detail"
 msgstr "用户详情"
 
@@ -2399,8 +2408,8 @@ msgstr "用户删除失败"
 msgid "OTP"
 msgstr ""
 
-#: users/templates/users/user_profile.html:100 users/views/user.py:177
-#: users/views/user.py:229
+#: users/templates/users/user_profile.html:100 users/views/user.py:179
+#: users/views/user.py:233
 msgid "User groups"
 msgstr "用户组"
 
@@ -2420,7 +2429,7 @@ msgstr "指纹"
 msgid "Update public key"
 msgstr "更新密钥"
 
-#: users/templates/users/user_update.html:4 users/views/user.py:91
+#: users/templates/users/user_update.html:4 users/views/user.py:93
 msgid "Update user"
 msgstr "编辑用户"
 
@@ -2611,27 +2620,29 @@ msgstr "首次登陆"
 msgid "Login log list"
 msgstr "登录日志"
 
-#: users/views/user.py:101
+#: users/views/user.py:103
 msgid "Bulk update user success"
 msgstr "批量更新用户成功"
 
-#: users/views/user.py:206
+#: users/views/user.py:208
 msgid "Invalid file."
 msgstr "文件不合法"
 
-#: users/views/user.py:301
+#: users/views/user.py:305
 msgid "User granted assets"
 msgstr "用户授权资产"
 
-#: users/views/user.py:331
+#: users/views/user.py:335
 msgid "Profile setting"
 msgstr "个人信息设置"
 
-#: users/views/user.py:349
+#: users/views/user.py:353
 msgid "Password update"
 msgstr "密码更新"
 
-#: users/views/user.py:371
+#: users/views/user.py:375
 msgid "Public key update"
 msgstr "秘钥更新"
 
+#~ msgid "Help"
+#~ msgstr "帮助"
diff --git a/apps/jumpserver/views.py b/apps/jumpserver/views.py
index 0ddba94bf..d37a3ff26 100644
--- a/apps/jumpserver/views.py
+++ b/apps/jumpserver/views.py
@@ -45,7 +45,8 @@ class IndexView(LoginRequiredMixin, TemplateView):
         return self.session_week.values('user').distinct().count()
 
     def get_week_login_asset_count(self):
-        return self.session_week.values('asset').distinct().count()
+        return self.session_week.count()
+        # return self.session_week.values('asset').distinct().count()
 
     def get_month_day_metrics(self):
         month_str = [d.strftime('%m-%d') for d in self.session_month_dates] or ['0']
diff --git a/apps/perms/serializers.py b/apps/perms/serializers.py
index cc65fc33e..6decf663b 100644
--- a/apps/perms/serializers.py
+++ b/apps/perms/serializers.py
@@ -12,7 +12,7 @@ class AssetPermissionCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = NodePermission
         fields = [
-            'node', 'user_group', 'system_user',
+            'id', 'node', 'user_group', 'system_user',
             'is_active', 'date_expired'
         ]
 
diff --git a/apps/templates/_header_bar.html b/apps/templates/_header_bar.html
index 74c0787c9..9c72fe38b 100644
--- a/apps/templates/_header_bar.html
+++ b/apps/templates/_header_bar.html
@@ -15,7 +15,12 @@
 {#            </li>#}
             <li class="dropdown">
                 <a class="dropdown-toggle count-info" data-toggle="dropdown" href="#">
-                     <span class="m-r-sm text-muted welcome-message">{% trans 'Help' %}</span>
+                    <span class="m-r-sm text-muted welcome-message">{% trans 'Supports' %}</span>
+                </a>
+            </li>
+            <li class="dropdown">
+                <a class="count-info"  href="http://jumpserver.readthedocs.io/zh/docs/_build/html/">
+                     <span class="m-r-sm text-muted welcome-message">{% trans 'Docs' %}</span>
                 </a>
             </li>
             <li class="dropdown">
diff --git a/apps/templates/index.html b/apps/templates/index.html
index 64b8637ce..800b1d46f 100644
--- a/apps/templates/index.html
+++ b/apps/templates/index.html
@@ -57,7 +57,7 @@
     <div class="row">
         <div class="col-sm-2 border-bottom white-bg dashboard-header" style="margin-left:15px;height: 346px">
             <h2>活跃用户TOP5</h2>
-            <small>过去一周共有<span class="text-info">{{ user_visit_count_weekly }}</span>位用户登录<span class="text-success">{{ asset_visit_count_weekly }}</span>次服务器.</small>
+            <small>过去一周共有<span class="text-info">{{ user_visit_count_weekly }}</span>位用户登录<span class="text-success">{{ asset_visit_count_weekly }}</span>次资产.</small>
             <ul class="list-group clear-list m-t">
                 {% for data in user_visit_count_top_five %}
                     <li class="list-group-item fist-item">
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 47989e7e8..42f3bc36a 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -56,8 +56,8 @@ uritemplate==3.0.0
 urllib3==1.22
 vine==1.1.4
 gunicorn==19.7.1
-https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat
-#django_celery_beat==1.1.0
+#https://github.com/celery/django-celery-beat/zipball/master#egg=django-celery-beat
+django_celery_beat==1.1.1
 ephem==3.7.6.0
 python-gssapi==0.6.4
 jms-es-sdk