From bf53df46dc8ebdd8f80b4c1dbdc623936e99d05b Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Mon, 17 May 2021 19:11:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8C=85=E5=90=AB?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E6=97=B6=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=88=A0=E9=99=A4=E7=BB=84=E7=BB=87=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(#6130)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Bai --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 75055 -> 74907 bytes apps/locale/zh/LC_MESSAGES/django.po | 37 +++++++++++++-------------- apps/orgs/api.py | 7 +++-- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 70c15aafc0ad5797565364e167bab1d948d1fb7a..1272a409d6bb7dce4f96f3e04df23de3c6b07b69 100644 GIT binary patch delta 22066 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 X+x+O=>+bDY{QqjVwQ}NsrXl|eJhf5w diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 41403c0a4..1434212a1 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: 2021-05-17 16:17+0800\n" +"POT-Creation-Date: 2021-05-17 18:56+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1811,36 +1811,36 @@ msgstr "没有该主机 {} 权限" msgid "Operations" msgstr "运维" -#: ops/mixin.py:29 ops/mixin.py:92 ops/mixin.py:160 +#: ops/mixin.py:29 ops/mixin.py:92 ops/mixin.py:162 msgid "Cycle perform" msgstr "周期执行" -#: ops/mixin.py:33 ops/mixin.py:90 ops/mixin.py:109 ops/mixin.py:148 +#: ops/mixin.py:33 ops/mixin.py:90 ops/mixin.py:109 ops/mixin.py:150 msgid "Regularly perform" msgstr "定期执行" -#: ops/mixin.py:106 ops/mixin.py:145 +#: ops/mixin.py:106 ops/mixin.py:147 #: xpack/plugins/change_auth_plan/serializers.py:53 msgid "Periodic perform" msgstr "定时执行" -#: ops/mixin.py:111 +#: ops/mixin.py:112 msgid "Interval" msgstr "间隔" -#: ops/mixin.py:120 +#: ops/mixin.py:122 msgid "* Please enter a valid crontab expression" msgstr "* 请输入有效的 crontab 表达式" -#: ops/mixin.py:127 +#: ops/mixin.py:129 msgid "Range {} to {}" msgstr "输入在 {} - {} 范围之间" -#: ops/mixin.py:138 +#: ops/mixin.py:140 msgid "Require periodic or regularly perform setting" msgstr "需要周期或定期设置" -#: ops/mixin.py:149 +#: ops/mixin.py:151 msgid "" "eg: Every Sunday 03:05 run <5 3 * * 0>
Tips: Using 5 digits linux " "crontab expressions (在线工" "具
注意: 如果同时设置了定期执行和周期执行,优先使用定期执行" -#: ops/mixin.py:160 +#: ops/mixin.py:162 msgid "Tips: (Units: hour)" msgstr "提示:(单位: 时)" @@ -1962,12 +1962,11 @@ msgstr "更新任务内容: {}" msgid "Disk used more than 80%: {} => {}" msgstr "磁盘使用率超过 80%: {} => {}" -#: orgs/api.py:76 -#, python-brace-format -msgid "Have `{model._meta.verbose_name}` exists, Please delete" -msgstr "`{model._meta.verbose_name}` 存在数据, 请先删除" +#: orgs/api.py:79 +msgid "Have {} exists, Please delete" +msgstr "{} 存在数据, 请先删除" -#: orgs/api.py:80 +#: orgs/api.py:83 msgid "The current organization cannot be deleted" msgstr "当前组织不能被删除" @@ -3037,19 +3036,19 @@ msgstr "登录了" msgid "Filters" msgstr "过滤" -#: terminal/api/session.py:189 +#: terminal/api/session.py:185 msgid "Session does not exist: {}" msgstr "会话不存在: {}" -#: terminal/api/session.py:192 +#: terminal/api/session.py:188 msgid "Session is finished or the protocol not supported" msgstr "会话已经完成或协议不支持" -#: terminal/api/session.py:197 +#: terminal/api/session.py:193 msgid "User does not exist: {}" msgstr "用户不存在: {}" -#: terminal/api/session.py:201 +#: terminal/api/session.py:197 msgid "User does not have permission" msgstr "用户没有权限" diff --git a/apps/orgs/api.py b/apps/orgs/api.py index b241301a8..ace14112b 100644 --- a/apps/orgs/api.py +++ b/apps/orgs/api.py @@ -60,7 +60,10 @@ class OrgViewSet(BulkModelViewSet): @tmp_to_root_org() def get_data_from_model(self, model): if model == User: - data = model.objects.filter(orgs__id=self.org.id, m2m_org_members__role=ROLE.USER) + data = model.objects.filter( + orgs__id=self.org.id, + m2m_org_members__role__in=[ROLE.USER, ROLE.ADMIN, ROLE.AUDITOR] + ) elif model == Node: # 跟节点不能手动删除,所以排除检查 data = model.objects.filter(org_id=self.org.id).exclude(parent_key='', key__regex=r'^[0-9]+$') @@ -73,7 +76,7 @@ class OrgViewSet(BulkModelViewSet): for model in org_related_models: data = self.get_data_from_model(model) if data: - msg = _(f'Have `{model._meta.verbose_name}` exists, Please delete') + msg = _('Have {} exists, Please delete').format(model._meta.verbose_name) return Response(data={'error': msg}, status=status.HTTP_403_FORBIDDEN) else: if str(current_org) == str(self.org):