From 3f6d7637c37f221018ae14d96d65f76dd38ec726 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 13 Apr 2020 13:40:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B7=BB=E5=8A=A0CAS=E6=9D=A5=E6=BA=90=E9=80=89?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/users/utils.py b/apps/users/utils.py index 831c6571f..0729115b6 100644 --- a/apps/users/utils.py +++ b/apps/users/utils.py @@ -330,4 +330,6 @@ def get_source_choices(): choices.append((User.SOURCE_OPENID, choices_all[User.SOURCE_OPENID])) if settings.AUTH_RADIUS: choices.append((User.SOURCE_RADIUS, choices_all[User.SOURCE_RADIUS])) + if settings.AUTH_CAS: + choices.append((User.SOURCE_CAS, choices_all[User.SOURCE_CAS])) return choices From 06fb502a1dea6db9b9a43cfaec15b80f9adea450 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 13 Apr 2020 14:17:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=88:=20=E5=8A=A0=E5=85=A5=20->=20=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 89538 -> 89572 bytes apps/locale/zh/LC_MESSAGES/django.po | 10 +++++----- .../templates/terminal/session_list.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index a9ca58dc0f8a98989bdfd99931d97bef9e88ffed..0147921b680cdf2bdff1f9307efffbd77379233d 100644 GIT binary patch delta 25267 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 delta 25243 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ⅆ(w@&BmWoqmNXt8DA6N2 z^~ct|a-da@JayL6r?E{KN6kv&0yfTS`lTk-BmRZDuB3k$?>B3oU?U9)9PAP0Pq$vv zsQrpw&8aPpI?|9IMEUC^bvj6SHS*K(6a_~~e-Y2e*^E<|{AN;S>c6J_Vs+vuOuUq|G+)SG(l\n" "Language-Team: JumpServer team\n" @@ -3586,7 +3586,6 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 -#: terminal/templates/terminal/session_list.html:149 #: users/templates/users/user_detail.html:226 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:101 msgid "Join" @@ -5064,6 +5063,10 @@ msgstr "终断任务已发送,请等待" msgid "Terminate" msgstr "终断" +#: terminal/templates/terminal/session_list.html:149 +msgid "Monitoring" +msgstr "监控" + #: terminal/templates/terminal/session_list.html:179 msgid "Finish session success" msgstr "标记会话完成成功" @@ -7412,9 +7415,6 @@ msgstr "创建" #~ msgid "If set id, will use this id update user existed" #~ msgstr "如果设置了id,则会使用该行信息更新该id的用户" -#~ msgid "Monitor" -#~ msgstr "监控" - #~ msgid "Beijing Duizhan Tech, Inc." #~ msgstr "北京堆栈科技有限公司" diff --git a/apps/terminal/templates/terminal/session_list.html b/apps/terminal/templates/terminal/session_list.html index ff25a5fbb..6876ed448 100644 --- a/apps/terminal/templates/terminal/session_list.html +++ b/apps/terminal/templates/terminal/session_list.html @@ -146,7 +146,7 @@ function initTable() { .replace("sessionID", cellData) .replace("terminalID", rowData.terminal) } - var joinBtn = ' {% trans "Join" %}'; + var joinBtn = ' {% trans "Monitoring" %}'; joinBtn = joinBtn.replace("sessionID", rowData.id); if (rowData.can_join){ joinBtn = joinBtn.replace("disabled", "") From d5e1ca79088d427fd03e8b04cf68be5ef6b768a7 Mon Sep 17 00:00:00 2001 From: Bai Date: Mon, 13 Apr 2020 14:19:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E6=B7=BB=E5=8A=A0=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 8fe3f23a0..f1e5999e4 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -6425,7 +6425,7 @@ msgstr "选择管理员" #: xpack/plugins/cloud/forms.py:85 msgid "Tips: The asset information is always covered" -msgstr "" +msgstr "提示:资产信息总是被覆盖" #: xpack/plugins/cloud/meta.py:9 xpack/plugins/cloud/views.py:27 #: xpack/plugins/cloud/views.py:44 xpack/plugins/cloud/views.py:62