From 1e3da5097935cb6aad71a1b689d29a182d3c143d Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 16 Jun 2022 16:47:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AF=9D?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AE=B0=E5=BD=95=E6=9B=B4=E6=96=B0=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/api/sharing.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/terminal/api/sharing.py b/apps/terminal/api/sharing.py index 114a00da1..1a9545e54 100644 --- a/apps/terminal/api/sharing.py +++ b/apps/terminal/api/sharing.py @@ -43,6 +43,9 @@ class SessionJoinRecordsViewSet(OrgModelViewSet): ) filterset_fields = search_fields model = models.SessionJoinRecord + rbac_perms = { + 'finished': 'terminal.change_sessionjoinrecord' + } def create(self, request, *args, **kwargs): try: From adc8a8f7d3fbc64623fbf6a7c4dec499c6a1c79c Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 16 Jun 2022 14:19:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/ja/LC_MESSAGES/django.mo | 4 ++-- apps/locale/ja/LC_MESSAGES/django.po | 2 +- apps/locale/zh/LC_MESSAGES/django.mo | 4 ++-- apps/locale/zh/LC_MESSAGES/django.po | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.mo b/apps/locale/ja/LC_MESSAGES/django.mo index 4618d1b80..d0d6aaf5d 100644 --- a/apps/locale/ja/LC_MESSAGES/django.mo +++ b/apps/locale/ja/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:449dcbd8e4b4f133d45e01642bb42a20477b09309d2b916f1aff9e854e6864e8 -size 128120 +oid sha256:132e7f59a56d1cf5b2358b21b547861e872fa456164f2e0809120fb2b13f0ec1 +size 128122 diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index c79aac704..ab8d5b532 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -4299,7 +4299,7 @@ msgstr "属性マップの有効化" #: settings/serializers/terminal.py:37 msgid "Enable Razor" -msgstr "XRDPの有効化" +msgstr "Razor の有効化" #: settings/serializers/terminal.py:38 msgid "Enable SSH Client" diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index a35dad64a..5bafa0526 100644 --- a/apps/locale/zh/LC_MESSAGES/django.mo +++ b/apps/locale/zh/LC_MESSAGES/django.mo @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ea5daa59f376f85ad67dde8332499637e0e82999dcf051853589d1ebf22eca3 -size 105893 +oid sha256:002f6953ebbe368642f0ea3c383f617b5f998edf2238341be63393123d4be8a9 +size 105894 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 3b3aeb02f..874df532d 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -4237,7 +4237,7 @@ msgstr "启用数据库组件" #: settings/serializers/terminal.py:37 msgid "Enable Razor" -msgstr "启用 XRDP 服务" +msgstr "启用 Razor 服务" #: settings/serializers/terminal.py:38 msgid "Enable SSH Client" From 8e43e9ee2b08ee67eb9806a3096368c208677108 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 16 Jun 2022 17:49:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=8E=88=E6=9D=83=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/perms/tasks.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/perms/tasks.py b/apps/perms/tasks.py index 237eac5ac..da96beb68 100644 --- a/apps/perms/tasks.py +++ b/apps/perms/tasks.py @@ -80,7 +80,7 @@ def check_asset_permission_will_expired(): if org in org_perm_remain_day_mapper[remain_days]: org_perm_remain_day_mapper[remain_days][org].add(asset_perm) else: - org_perm_remain_day_mapper[remain_days][org] = set() + org_perm_remain_day_mapper[remain_days][org] = {asset_perm, } # 计算每个用户即将过期的资产 users = asset_perm.get_all_users() @@ -90,7 +90,7 @@ def check_asset_permission_will_expired(): if u in user_asset_remain_day_mapper[remain_days]: user_asset_remain_day_mapper[remain_days][u].update(assets) else: - user_asset_remain_day_mapper[remain_days][u] = set() + user_asset_remain_day_mapper[remain_days][u] = set(assets) for day_count, user_asset_mapper in user_asset_remain_day_mapper.items(): for user, assets in user_asset_mapper.items(): @@ -127,7 +127,7 @@ def check_app_permission_will_expired(): if org in org_perm_remain_day_mapper[remain_days]: org_perm_remain_day_mapper[remain_days][org].add(app_perm) else: - org_perm_remain_day_mapper[remain_days][org] = set() + org_perm_remain_day_mapper[remain_days][org] = {app_perm, } users = app_perm.get_all_users() apps = app_perm.applications.all() @@ -135,7 +135,7 @@ def check_app_permission_will_expired(): if u in user_app_remain_day_mapper[remain_days]: user_app_remain_day_mapper[remain_days][u].update(apps) else: - user_app_remain_day_mapper[remain_days][u] = set() + user_app_remain_day_mapper[remain_days][u] = set(apps) for day_count, user_app_mapper in user_app_remain_day_mapper.items(): for user, apps in user_app_mapper.items(): From 298f6ba41d63b8e7f56e7ec415da472cb84e6fca Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Thu, 16 Jun 2022 17:23:49 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/ja/LC_MESSAGES/django.po | 4 ++-- apps/locale/zh/LC_MESSAGES/django.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index ab8d5b532..6b94dad82 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -1768,11 +1768,11 @@ msgstr "{ApplicationPermission} 削除 {SystemUser}" #: authentication/api/confirm.py:40 msgid "Authentication failed password incorrect" -msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません): {}" +msgstr "認証に失敗しました (ユーザー名またはパスワードが正しくありません)" #: authentication/api/confirm.py:48 msgid "Login time has exceeded {} minutes, please login again" -msgstr "" +msgstr "ログイン時間が {} 分を超えました。もう一度ログインしてください" #: authentication/api/confirm.py:72 common/exceptions.py:47 msgid "This action require verify your MFA" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 874df532d..d0944cb51 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -1756,11 +1756,11 @@ msgstr "{ApplicationPermission} 移除 {SystemUser}" #: authentication/api/confirm.py:40 msgid "Authentication failed password incorrect" -msgstr "认证失败 (用户名或密码不正确): {}" +msgstr "认证失败 (用户名或密码不正确)" #: authentication/api/confirm.py:48 msgid "Login time has exceeded {} minutes, please login again" -msgstr "" +msgstr "登录时长已超过 {} 分钟，请重新登录" #: authentication/api/confirm.py:72 common/exceptions.py:47 msgid "This action require verify your MFA" From 81598a526429f58a2d663cc1579808846eabe119 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Thu, 16 Jun 2022 18:02:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?perf:=20=E6=8E=A8=E9=80=81=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=E7=94=A8=E6=88=B7=E5=90=8D=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks/push_system_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/tasks/push_system_user.py b/apps/assets/tasks/push_system_user.py index cd32d8e15..8834a29e9 100644 --- a/apps/assets/tasks/push_system_user.py +++ b/apps/assets/tasks/push_system_user.py @@ -274,7 +274,7 @@ def push_system_user_a_asset_manual(system_user, asset, username=None): # if username is None: # username = system_user.username task_name = gettext_noop("Push system users to asset: ") + "{}({}) => {}".format( - system_user.name, username or '', asset + system_user.name, username or system_user.username, asset ) return push_system_user_util(system_user, [asset], task_name=task_name, username=username)