From 93895b6b9289214b437b99313f986807c6ad4f5b Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 14 Mar 2018 18:14:37 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=96=87=E6=A1=88=E8=AF=B4=E6=98=8E=E5=92=8C=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/forms/asset.py | 10 +- .../templates/assets/admin_user_list.html | 3 +- .../templates/assets/system_user_list.html | 6 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 29828 -> 29717 bytes apps/i18n/zh/LC_MESSAGES/django.po | 124 ++++++++++-------- apps/ops/templates/ops/task_list.html | 4 +- 6 files changed, 78 insertions(+), 69 deletions(-) diff --git a/apps/assets/forms/asset.py b/apps/assets/forms/asset.py index d5f4ccd04..65716f533 100644 --- a/apps/assets/forms/asset.py +++ b/apps/assets/forms/asset.py @@ -35,9 +35,8 @@ class AssetCreateForm(forms.ModelForm): 'ip': '* required', 'port': '* required', 'admin_user': _( - 'Admin user is a privilege user exist on this asset,' - 'Example: root or other NOPASSWD sudo privilege user' - 'If asset not support ansible, set any one' + 'root or other NOPASSWD sudo privilege user existed in asset,' + 'If asset is windows or other set any one, more see admin user left menu' ), 'platform': _("* required Must set exact system platform, Windows, Linux ...") } @@ -68,9 +67,8 @@ class AssetUpdateForm(forms.ModelForm): 'port': '* required', 'cluster': '* required', 'admin_user': _( - 'Admin user is a privilege user exist on this asset,' - 'Example: root or other NOPASSWD sudo privilege user' - 'If asset not support ansible, set any one' + 'root or other NOPASSWD sudo privilege user existed in asset,' + 'If asset is windows or other set any one, more see admin user left menu' ), 'platform': _("* required Must set exact system platform, Windows, Linux ...") } diff --git a/apps/assets/templates/assets/admin_user_list.html b/apps/assets/templates/assets/admin_user_list.html index 7cccc6d03..bcb40fb29 100644 --- a/apps/assets/templates/assets/admin_user_list.html +++ b/apps/assets/templates/assets/admin_user_list.html @@ -5,7 +5,8 @@ {% block help_message %}
- 管理用户是 服务器上已存在的特权用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。 + 管理用户是服务器的root，或拥有 NOPASSWD: ALL sudo权限的用户，Jumpserver使用该用户来 `推送系统用户`、`获取资产硬件信息`等。 + Windows或其它硬件可以随意设置一个
{% endblock %} diff --git a/apps/assets/templates/assets/system_user_list.html b/apps/assets/templates/assets/system_user_list.html index b1dd401bc..9e83f93d3 100644 --- a/apps/assets/templates/assets/system_user_list.html +++ b/apps/assets/templates/assets/system_user_list.html @@ -3,8 +3,10 @@ {% block help_message %}
- 系统用户是 用户登录资产(服务器)时使用的用户，如 web, sa, dba等具有特殊功能的用户。系统用户创建时，如果选择了自动推送 - Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。 + 系统用户是 Jumpserver跳转登录资产时使用的用户，可以理解为登录资产用户，如 web, sa, dba(`ssh web@some-host`), 而不是使用某个用户的用户名跳转登录服务器(`ssh xiaoming@some-host`); + 简单来说是 用户使用自己的用户名登录Jumpserver, Jumpserver使用系统用户登录资产。 + 系统用户创建时，如果选择了自动推送 Jumpserver会使用ansible自动推送系统用户到资产中，如果资产(交换机、windows)不支持ansible, 请手动填写账号密码。 + 目前还不支持Windows的自动推送
{% endblock %} diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index c4e2c1b8a8747972183408204baee2015edaaffd..a3449ac8e8fd080bc2bb03ab6fd29c78cf183d61 100644 GIT binary patch delta 10694 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 eK6`#Y-}CjouHSFVeXqRgGyj^8=fVTN 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\n" "Language-Team: Jumpserver team\n" @@ -26,49 +26,49 @@ msgid "更新节点资产硬件信息: {}" msgstr "" #: assets/api/node.py:147 -msgid "Test node assets connective: {}" -msgstr "测试节点资产可连接性" +msgid "测试节点下资产是否可连接: {}" +msgstr "" -#: assets/forms/asset.py:23 assets/forms/asset.py:55 assets/forms/user.py:125 +#: assets/forms/asset.py:23 assets/forms/asset.py:54 assets/forms/user.py:125 #: 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/asset_detail.html:183 +#: assets/templates/assets/asset_detail.html:191 #: assets/templates/assets/system_user_detail.html:166 msgid "Nodes" msgstr "节点管理" -#: assets/forms/asset.py:26 assets/forms/asset.py:58 assets/forms/asset.py:95 -#: assets/forms/asset.py:99 assets/models/asset.py:57 +#: assets/forms/asset.py:26 assets/forms/asset.py:57 assets/forms/asset.py:93 +#: assets/forms/asset.py:97 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:61 assets/models/asset.py:81 +#: assets/forms/asset.py:29 assets/forms/asset.py:60 assets/models/asset.py:81 #: assets/templates/assets/asset_create.html:32 -#: assets/templates/assets/asset_detail.html:218 +#: assets/templates/assets/asset_detail.html:220 #: assets/templates/assets/asset_update.html:37 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" -#: assets/forms/asset.py:38 assets/forms/asset.py:71 +#: assets/forms/asset.py:38 assets/forms/asset.py:70 msgid "" -"Admin user is a privilege user exist on this asset,Example: root or other " -"NOPASSWD sudo privilege userIf asset not support ansible, set any one" +"root or other NOPASSWD sudo privilege user existed in asset,If asset is " +"windows or other set any one, more see admin user left menu" msgstr "" -"管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果资产" -"是Windows或交换机, 任意设置一个即可" +"root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" +"个, 更多信息查看左侧 `管理用户` 菜单" -#: assets/forms/asset.py:42 assets/forms/asset.py:75 +#: assets/forms/asset.py:41 assets/forms/asset.py:73 msgid "* required Must set exact system platform, Windows, Linux ..." msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..." -#: assets/forms/asset.py:82 assets/forms/asset.py:86 assets/forms/label.py:15 +#: assets/forms/asset.py:80 assets/forms/asset.py:84 assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:244 msgid "Select assets" msgstr "选择资产" -#: assets/forms/asset.py:91 assets/models/asset.py:52 +#: assets/forms/asset.py:89 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 @@ -76,18 +76,18 @@ msgstr "选择资产" msgid "Port" msgstr "端口" -#: assets/forms/asset.py:111 assets/templates/assets/asset_create.html:36 +#: assets/forms/asset.py:109 assets/templates/assets/asset_create.html:36 msgid "Select labels" msgstr "选择标签" -#: assets/forms/asset.py:114 assets/templates/assets/admin_user_detail.html:91 +#: assets/forms/asset.py:112 assets/templates/assets/admin_user_detail.html:91 msgid "Select nodes" msgstr "选择节点" #: assets/forms/label.py:13 assets/models/asset.py:153 -#: assets/templates/assets/admin_user_list.html:24 +#: assets/templates/assets/admin_user_list.html:25 #: assets/templates/assets/label_list.html:16 -#: assets/templates/assets/system_user_list.html:26 perms/models.py:17 +#: assets/templates/assets/system_user_list.html:28 perms/models.py:17 #: terminal/backends/command/models.py:11 terminal/models.py:123 #: terminal/templates/terminal/command_list.html:40 #: terminal/templates/terminal/command_list.html:73 @@ -125,10 +125,10 @@ msgstr "密码和私钥, 必须输入一个" #: assets/forms/user.py:79 assets/forms/user.py:120 assets/models/cluster.py:18 #: assets/models/group.py:20 assets/models/label.py:17 assets/models/user.py:28 #: assets/templates/assets/admin_user_detail.html:56 -#: assets/templates/assets/admin_user_list.html:22 +#: assets/templates/assets/admin_user_list.html:23 #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 -#: assets/templates/assets/system_user_list.html:24 common/models.py:26 +#: assets/templates/assets/system_user_list.html:26 common/models.py:26 #: common/templates/common/terminal_setting.html:67 #: 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 @@ -148,9 +148,9 @@ msgstr "名称" #: assets/forms/user.py:80 assets/forms/user.py:121 assets/models/user.py:29 #: assets/templates/assets/admin_user_detail.html:60 -#: assets/templates/assets/admin_user_list.html:23 +#: assets/templates/assets/admin_user_list.html:24 #: assets/templates/assets/system_user_detail.html:62 -#: assets/templates/assets/system_user_list.html:25 +#: assets/templates/assets/system_user_list.html:27 #: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14 #: users/models/authentication.py:45 users/models/user.py:34 #: users/templates/users/_select_user_modal.html:14 @@ -297,10 +297,10 @@ msgstr "创建日期" #: 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 +#: assets/templates/assets/admin_user_list.html:29 #: assets/templates/assets/asset_detail.html:125 #: assets/templates/assets/system_user_detail.html:100 -#: assets/templates/assets/system_user_list.html:30 common/models.py:30 +#: assets/templates/assets/system_user_list.html:32 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:26 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 @@ -556,21 +556,21 @@ msgstr "激活中" #: assets/templates/assets/_asset_list_modal.html:24 #: assets/templates/assets/admin_user_assets.html:54 -#: assets/templates/assets/admin_user_list.html:25 -#: assets/templates/assets/asset_detail.html:357 +#: assets/templates/assets/admin_user_list.html:26 +#: assets/templates/assets/asset_detail.html:359 #: assets/templates/assets/asset_list.html:90 #: assets/templates/assets/system_user_asset.html:52 -#: assets/templates/assets/system_user_list.html:27 +#: assets/templates/assets/system_user_list.html:29 #: users/templates/users/user_granted_asset.html:47 #: users/templates/users/user_group_granted_asset.html:47 msgid "Reachable" msgstr "可连接" #: assets/templates/assets/_asset_list_modal.html:25 -#: assets/templates/assets/admin_user_list.html:29 +#: assets/templates/assets/admin_user_list.html:30 #: assets/templates/assets/asset_list.html:91 #: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_list.html:31 +#: assets/templates/assets/system_user_list.html:33 #: 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 @@ -633,12 +633,12 @@ msgstr "提交" #: assets/templates/assets/_asset_list_modal.html:79 #: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:84 +#: assets/templates/assets/admin_user_list.html:85 #: assets/templates/assets/asset_detail.html:24 #: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/label_list.html:38 #: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:85 +#: assets/templates/assets/system_user_list.html:87 #: perms/templates/perms/asset_permission_detail.html:30 #: perms/templates/perms/asset_permission_list.html:121 #: terminal/templates/terminal/terminal_detail.html:16 @@ -652,12 +652,12 @@ msgstr "更新" #: assets/templates/assets/_asset_list_modal.html:80 #: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:85 +#: assets/templates/assets/admin_user_list.html:86 #: assets/templates/assets/asset_detail.html:28 #: assets/templates/assets/asset_list.html:169 #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:86 +#: assets/templates/assets/system_user_list.html:88 #: ops/templates/ops/task_list.html:71 #: perms/templates/perms/asset_permission_detail.html:34 #: perms/templates/perms/asset_permission_list.html:122 @@ -751,12 +751,12 @@ msgid "Quick update" msgstr "快速更新" #: assets/templates/assets/admin_user_assets.html:72 -#: assets/templates/assets/asset_detail.html:167 +#: assets/templates/assets/asset_detail.html:168 msgid "Test connective" msgstr "测试可连接性" #: assets/templates/assets/admin_user_assets.html:75 -#: assets/templates/assets/asset_detail.html:170 +#: assets/templates/assets/asset_detail.html:171 #: assets/templates/assets/system_user_asset.html:81 #: assets/templates/assets/system_user_detail.html:147 msgid "Test" @@ -771,10 +771,10 @@ msgid "Replace node assets admin user with this" msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:198 +#: assets/templates/assets/asset_detail.html:200 #: assets/templates/assets/asset_list.html:586 #: assets/templates/assets/system_user_detail.html:183 -#: assets/templates/assets/system_user_list.html:135 templates/_modal.html:16 +#: assets/templates/assets/system_user_list.html:137 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:339 #: users/templates/users/user_detail.html:364 @@ -786,18 +786,18 @@ msgstr "替换资产的管理员" msgid "Confirm" msgstr "确认" -#: assets/templates/assets/admin_user_list.html:14 +#: assets/templates/assets/admin_user_list.html:15 #: assets/views/admin_user.py:48 msgid "Create admin user" msgstr "创建管理用户" -#: assets/templates/assets/admin_user_list.html:26 -#: assets/templates/assets/system_user_list.html:28 +#: assets/templates/assets/admin_user_list.html:27 +#: assets/templates/assets/system_user_list.html:30 msgid "Unreachable" msgstr "不可达" -#: assets/templates/assets/admin_user_list.html:27 -#: assets/templates/assets/system_user_list.html:29 +#: assets/templates/assets/admin_user_list.html:28 +#: assets/templates/assets/system_user_list.html:31 #: ops/templates/ops/adhoc_history.html:54 #: ops/templates/ops/task_history.html:57 msgid "Ratio" @@ -841,15 +841,15 @@ msgstr "创建日期" msgid "Quick modify" msgstr "快速修改" -#: assets/templates/assets/asset_detail.html:159 +#: assets/templates/assets/asset_detail.html:160 msgid "Refresh hardware" msgstr "更新硬件信息" -#: assets/templates/assets/asset_detail.html:162 +#: assets/templates/assets/asset_detail.html:163 msgid "Refresh" msgstr "刷新" -#: assets/templates/assets/asset_detail.html:299 +#: assets/templates/assets/asset_detail.html:301 #: users/templates/users/user_detail.html:273 msgid "Update successfully!" msgstr "更新成功" @@ -906,7 +906,7 @@ msgid "Have child node, cancel" msgstr "存在子节点，不能删除" #: assets/templates/assets/asset_list.html:581 -#: assets/templates/assets/system_user_list.html:130 +#: assets/templates/assets/system_user_list.html:132 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 #: users/templates/users/user_group_list.html:81 @@ -990,25 +990,25 @@ msgstr "Uid" msgid "Add to node" msgstr "添加到节点" -#: assets/templates/assets/system_user_list.html:16 +#: assets/templates/assets/system_user_list.html:18 #: assets/views/system_user.py:45 msgid "Create system user" msgstr "创建系统用户" -#: assets/templates/assets/system_user_list.html:131 +#: assets/templates/assets/system_user_list.html:133 msgid "This will delete the selected System Users !!!" msgstr "删除选择系统用户" -#: assets/templates/assets/system_user_list.html:139 +#: assets/templates/assets/system_user_list.html:141 msgid "System Users Deleted." msgstr "已被删除" -#: assets/templates/assets/system_user_list.html:140 -#: assets/templates/assets/system_user_list.html:145 +#: assets/templates/assets/system_user_list.html:142 +#: assets/templates/assets/system_user_list.html:147 msgid "System Users Delete" msgstr "删除系统用户" -#: assets/templates/assets/system_user_list.html:144 +#: assets/templates/assets/system_user_list.html:146 msgid "System Users Deleting failed." msgstr "系统用户删除失败" @@ -1548,7 +1548,7 @@ msgstr "日期" msgid "Run" msgstr "执行" -#: ops/templates/ops/task_list.html:125 +#: ops/templates/ops/task_list.html:123 msgid "Task start: " msgstr "任务开始: " @@ -2668,6 +2668,16 @@ msgstr "密码更新" msgid "Public key update" msgstr "密钥更新" +#~ msgid "Test node assets connective: {}" +#~ msgstr "测试节点资产可连接性" + +#~ msgid "" +#~ "Admin user is a privilege user exist on this asset,Example: root or other " +#~ "NOPASSWD sudo privilege userIf asset not support ansible, set any one" +#~ msgstr "" +#~ "管理用户是资产上已经存在的特权用户，如 root或者其它有NOPASSWD的用户, 如果" +#~ "资产是Windows或交换机, 任意设置一个即可" + #~ msgid "Refresh node assets hardware info: {}" #~ msgstr "更新一些资产硬件信息: {}" diff --git a/apps/ops/templates/ops/task_list.html b/apps/ops/templates/ops/task_list.html index e564eec73..f098a4d78 100644 --- a/apps/ops/templates/ops/task_list.html +++ b/apps/ops/templates/ops/task_list.html @@ -112,9 +112,7 @@ $(document).ready(function() { alert(data) }; var success = function () { - setTimeout(function () { - console.log("ok") - }, 1000); + alert("任务开始执行，重定向到任务详情页面，多刷新几次查看结果") window.location = "{% url 'ops:task-detail' pk=DEFAULT_PK %}".replace('{{ DEFAULT_PK }}', uid); }; APIUpdateAttr({