From 8bead0a33b343c2ee148ca47a1352a68ff69036a Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 20 Jun 2019 11:45:45 +0800 Subject: [PATCH] [Update] Merge master_bugfix to dev_bugfix (#2817) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 邮件设置添加配置项：发送账号 (#2795) * [Bugfix] 修复普通用户被授权的RemoteApp列表加载为空的bug * [Bugfix] 修复普通用户加载被授权的RemoteApp为空的bug * [Update] 修改邮件测试的接受者为发送者 --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 77458 -> 77602 bytes apps/locale/zh/LC_MESSAGES/django.po | 76 +++++++++++++-------------- apps/perms/mixins.py | 2 - apps/settings/api.py | 2 +- 4 files changed, 37 insertions(+), 43 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 2e7a24b89f6a0b5ead92e568320a291ebd24802e..c125e16afe9ba19093777fd05ac950dcd0aaa06b 100644 GIT binary patch delta 22506 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 ohTU8>;`ZDjYaAkWK; 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 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 16eab6dd9..8feb8f959 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: 2019-06-19 18:16+0800\n" +"POT-Creation-Date: 2019-06-20 11:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -210,7 +210,7 @@ msgstr "参数" #: assets/models/cluster.py:28 assets/models/cmd_filter.py:25 #: assets/models/cmd_filter.py:58 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:68 -#: assets/templates/assets/asset_detail.html:129 +#: assets/templates/assets/asset_detail.html:128 #: assets/templates/assets/cmd_filter_detail.html:77 #: assets/templates/assets/domain_detail.html:72 #: assets/templates/assets/system_user_detail.html:100 @@ -265,7 +265,7 @@ msgstr "创建日期" #: assets/models/domain.py:53 assets/models/group.py:23 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_list.html:53 -#: assets/templates/assets/asset_detail.html:137 +#: assets/templates/assets/asset_detail.html:136 #: assets/templates/assets/cmd_filter_detail.html:65 #: assets/templates/assets/cmd_filter_list.html:27 #: assets/templates/assets/cmd_filter_rule_list.html:62 @@ -619,8 +619,8 @@ msgid "Test if the assets under the node are connectable: {}" msgstr "测试节点下资产是否可连接: {}" #: assets/forms/asset.py:45 assets/models/asset.py:103 -#: assets/models/user.py:134 assets/templates/assets/asset_detail.html:195 -#: assets/templates/assets/asset_detail.html:203 +#: assets/models/user.py:134 assets/templates/assets/asset_detail.html:194 +#: assets/templates/assets/asset_detail.html:202 #: assets/templates/assets/system_user_asset.html:83 #: perms/models/asset_permission.py:38 #: xpack/plugins/change_auth_plan/models.py:72 @@ -629,7 +629,7 @@ msgstr "节点" #: assets/forms/asset.py:48 assets/forms/asset.py:83 assets/models/asset.py:107 #: assets/models/cluster.py:19 assets/models/user.py:92 -#: assets/templates/assets/asset_detail.html:81 templates/_nav.html:24 +#: assets/templates/assets/asset_detail.html:80 templates/_nav.html:24 #: xpack/plugins/cloud/models.py:124 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:65 #: xpack/plugins/orgs/templates/orgs/org_list.html:18 @@ -647,7 +647,7 @@ msgstr "标签" #: assets/forms/asset.py:54 assets/forms/asset.py:89 assets/models/asset.py:102 #: assets/models/domain.py:26 assets/models/domain.py:52 -#: assets/templates/assets/asset_detail.html:85 +#: assets/templates/assets/asset_detail.html:84 #: assets/templates/assets/user_asset_list.html:173 #: xpack/plugins/orgs/templates/orgs/org_list.html:17 msgid "Domain" @@ -858,14 +858,14 @@ msgstr "主机名" msgid "Protocol" msgstr "协议" -#: assets/models/asset.py:101 assets/templates/assets/asset_detail.html:109 +#: assets/models/asset.py:101 assets/templates/assets/asset_detail.html:108 #: assets/templates/assets/user_asset_list.html:170 msgid "Platform" msgstr "系统平台" #: assets/models/asset.py:104 assets/models/cmd_filter.py:21 #: assets/models/domain.py:54 assets/models/label.py:22 -#: assets/templates/assets/asset_detail.html:117 +#: assets/templates/assets/asset_detail.html:116 #: assets/templates/assets/user_asset_list.html:174 msgid "Is active" msgstr "激活" @@ -874,19 +874,19 @@ msgstr "激活" msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:111 assets/templates/assets/asset_detail.html:125 +#: assets/models/asset.py:111 assets/templates/assets/asset_detail.html:124 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:114 assets/templates/assets/asset_detail.html:89 +#: assets/models/asset.py:114 assets/templates/assets/asset_detail.html:88 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:115 assets/templates/assets/asset_detail.html:93 +#: assets/models/asset.py:115 assets/templates/assets/asset_detail.html:92 msgid "Model" msgstr "型号" -#: assets/models/asset.py:116 assets/templates/assets/asset_detail.html:121 +#: assets/models/asset.py:116 assets/templates/assets/asset_detail.html:120 msgid "Serial number" msgstr "序列号" @@ -907,7 +907,7 @@ msgstr "CPU核数" msgid "CPU vcpus" msgstr "CPU总数" -#: assets/models/asset.py:122 assets/templates/assets/asset_detail.html:101 +#: assets/models/asset.py:122 assets/templates/assets/asset_detail.html:100 msgid "Memory" msgstr "内存" @@ -919,7 +919,7 @@ msgstr "硬盘大小" msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:126 assets/templates/assets/asset_detail.html:113 +#: assets/models/asset.py:126 assets/templates/assets/asset_detail.html:112 #: assets/templates/assets/user_asset_list.html:171 msgid "OS" msgstr "操作系统" @@ -937,7 +937,7 @@ msgid "Hostname raw" msgstr "主机名原始" #: assets/models/asset.py:131 assets/templates/assets/asset_create.html:46 -#: assets/templates/assets/asset_detail.html:232 templates/_nav.html:26 +#: assets/templates/assets/asset_detail.html:231 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" @@ -1206,24 +1206,24 @@ msgstr "登录模式" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/serializers/asset.py:26 assets/templates/assets/asset_create.html:24 +#: assets/serializers/asset.py:46 assets/templates/assets/asset_create.html:24 msgid "Protocols" msgstr "协议组" -#: assets/serializers/asset.py:52 +#: assets/serializers/asset.py:73 msgid "Hardware info" msgstr "硬件信息" -#: assets/serializers/asset.py:53 assets/serializers/asset_user.py:29 +#: assets/serializers/asset.py:74 assets/serializers/asset_user.py:29 #: assets/templates/assets/_asset_user_list.html:18 msgid "Connectivity" msgstr "连接" -#: assets/serializers/asset.py:54 orgs/mixins.py:223 +#: assets/serializers/asset.py:75 orgs/mixins.py:223 msgid "Org name" msgstr "组织名称" -#: assets/serializers/asset.py:70 +#: assets/serializers/asset.py:93 msgid "Protocol duplicate: {}" msgstr "协议重复: {}" @@ -1400,7 +1400,7 @@ msgid "Please input password" msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 -#: assets/templates/assets/asset_detail.html:312 +#: assets/templates/assets/asset_detail.html:311 #: users/templates/users/user_detail.html:307 #: users/templates/users/user_detail.html:334 #: xpack/plugins/interface/views.py:35 @@ -1437,15 +1437,13 @@ msgid "Datetime" msgstr "日期" #: assets/templates/assets/_asset_user_list.html:61 -#, fuzzy -#| msgid "View auth" msgid "View" msgstr "查看认证" #: assets/templates/assets/_asset_user_list.html:63 #: assets/templates/assets/admin_user_assets.html:61 #: assets/templates/assets/asset_asset_user_list.html:57 -#: assets/templates/assets/asset_detail.html:183 +#: assets/templates/assets/asset_detail.html:182 #: assets/templates/assets/system_user_asset.html:63 #: assets/templates/assets/system_user_detail.html:151 msgid "Test" @@ -1535,7 +1533,7 @@ msgstr "快速更新" #: assets/templates/assets/admin_user_assets.html:58 #: assets/templates/assets/asset_asset_user_list.html:54 -#: assets/templates/assets/asset_detail.html:180 +#: assets/templates/assets/asset_detail.html:179 msgid "Test connective" msgstr "测试可连接性" @@ -1551,7 +1549,7 @@ msgid "Select nodes" msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:212 +#: assets/templates/assets/asset_detail.html:211 #: assets/templates/assets/asset_list.html:682 #: assets/templates/assets/cmd_filter_detail.html:106 #: assets/templates/assets/system_user_asset.html:100 @@ -1649,7 +1647,7 @@ msgid "Asset users of" msgstr "资产用户" #: assets/templates/assets/asset_asset_user_list.html:47 -#: assets/templates/assets/asset_detail.html:149 +#: assets/templates/assets/asset_detail.html:148 #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:138 #: users/templates/users/user_profile.html:146 @@ -1668,21 +1666,21 @@ msgstr "选择需要修改属性" msgid "Select all" msgstr "全选" -#: assets/templates/assets/asset_detail.html:97 +#: assets/templates/assets/asset_detail.html:96 msgid "CPU" msgstr "CPU" -#: assets/templates/assets/asset_detail.html:105 +#: assets/templates/assets/asset_detail.html:104 msgid "Disk" msgstr "硬盘" -#: assets/templates/assets/asset_detail.html:133 +#: assets/templates/assets/asset_detail.html:132 #: users/templates/users/user_detail.html:115 #: users/templates/users/user_profile.html:104 msgid "Date joined" msgstr "创建日期" -#: assets/templates/assets/asset_detail.html:155 +#: assets/templates/assets/asset_detail.html:154 #: assets/templates/assets/user_asset_list.html:46 #: perms/models/asset_permission.py:60 perms/models/base.py:38 #: perms/templates/perms/asset_permission_create_update.html:55 @@ -1698,11 +1696,11 @@ msgstr "创建日期" msgid "Active" msgstr "激活中" -#: assets/templates/assets/asset_detail.html:172 +#: assets/templates/assets/asset_detail.html:171 msgid "Refresh hardware" msgstr "更新硬件信息" -#: assets/templates/assets/asset_detail.html:175 +#: assets/templates/assets/asset_detail.html:174 msgid "Refresh" msgstr "刷新" @@ -5401,8 +5399,6 @@ msgid "Password rules" msgstr "密码规则" #: xpack/plugins/change_auth_plan/models.py:213 -#, fuzzy -#| msgid "For security, do not change root user's password" msgid "For security, do not change {} user's password" msgstr "为了安全，禁止更改 {} 用户的密码" @@ -5942,8 +5938,8 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" -#: xpack/plugins/vault/meta.py:11 xpack/plugins/vault/views.py:23 -#: xpack/plugins/vault/views.py:38 +#: xpack/plugins/vault/meta.py:11 xpack/plugins/vault/views.py:22 +#: xpack/plugins/vault/views.py:37 msgid "Vault" msgstr "密码匣子" @@ -5951,11 +5947,11 @@ msgstr "密码匣子" msgid "Import vault" msgstr "导入密码" -#: xpack/plugins/vault/views.py:24 +#: xpack/plugins/vault/views.py:23 msgid "vault list" msgstr "密码匣子" -#: xpack/plugins/vault/views.py:39 +#: xpack/plugins/vault/views.py:38 msgid "vault create" msgstr "创建" diff --git a/apps/perms/mixins.py b/apps/perms/mixins.py index 88c851adc..f1d7fac1e 100644 --- a/apps/perms/mixins.py +++ b/apps/perms/mixins.py @@ -1,7 +1,6 @@ # ~*~ coding: utf-8 ~*~ # - from orgs.utils import set_to_root_org __all__ = [ @@ -116,4 +115,3 @@ class ChangeOrgIfNeedMixin(object): def get(self, request, *args, **kwargs): self.change_org_if_need(request, kwargs) return super().get(request, *args, **kwargs) - diff --git a/apps/settings/api.py b/apps/settings/api.py index d399d207c..37d63bef1 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -39,7 +39,7 @@ class MailTestingAPI(APIView): subject = "Test" message = "Test smtp setting" email_from = email_from or email_host_user - send_mail(subject, message, email_from, [email_host_user]) + send_mail(subject, message, email_from, [email_from]) except Exception as e: return Response({"error": str(e)}, status=401)