From 151433004c0b759a5a0e4d3ece0c3b7d9bd0abb6 Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Fri, 17 Feb 2023 10:53:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E5=8E=BB=E6=8E=89dbeaver=E7=9A=84c?= =?UTF-8?q?lickhouse=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/terminal/applets/dbeaver/manifest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/terminal/applets/dbeaver/manifest.yml b/apps/terminal/applets/dbeaver/manifest.yml index a9b404f60..c8d44af64 100644 --- a/apps/terminal/applets/dbeaver/manifest.yml +++ b/apps/terminal/applets/dbeaver/manifest.yml @@ -14,4 +14,3 @@ protocols: - postgresql - sqlserver - oracle - - clickhouse From d85b024c477dc06a7cf8fac61d5004cf35d212d9 Mon Sep 17 00:00:00 2001 From: Bai Date: Fri, 17 Feb 2023 11:07:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=BC=80?= =?UTF-8?q?=20PERM=5FSINGLE=5FASSET=5FTO=5FUNGROUP=5FNODE=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=97=B6=E8=BF=94=E5=9B=9E=E4=B8=A4=E4=B8=AA=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E5=A4=B9=E8=8A=82=E7=82=B9=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/perms/utils/user_perm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/perms/utils/user_perm.py b/apps/perms/utils/user_perm.py index d7a3ea06a..12f979a4f 100644 --- a/apps/perms/utils/user_perm.py +++ b/apps/perms/utils/user_perm.py @@ -146,7 +146,7 @@ class UserPermNodeUtil: def get_ungrouped_node(self): assets_amount = UserPermAssetUtil(self.user).get_direct_assets().count() - return PermNode.get_favorite_node(assets_amount) + return PermNode.get_ungrouped_node(assets_amount) def get_top_level_nodes(self, with_unfolded_node=False): # 是否有节点展开, 展开的节点 From 7040f46565aac436c016f8c13836224560bc16b7 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 17 Feb 2023 12:30:11 +0800 Subject: [PATCH 3/3] perf: account view secret mfa (#9600) Co-authored-by: feng <1304903146@qq.com> --- apps/accounts/api/account/account.py | 2 +- apps/tickets/serializers/ticket/apply_asset.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/accounts/api/account/account.py b/apps/accounts/api/account/account.py index d03484b69..ad9c372c1 100644 --- a/apps/accounts/api/account/account.py +++ b/apps/accounts/api/account/account.py @@ -66,7 +66,7 @@ class AccountSecretsViewSet(RecordViewLogMixin, AccountViewSet): 'default': serializers.AccountSecretSerializer, } http_method_names = ['get', 'options'] - # permission_classes = [RBACPermission, UserConfirmation.require(ConfirmType.MFA)] + permission_classes = [RBACPermission, UserConfirmation.require(ConfirmType.MFA)] rbac_perms = { 'list': 'accounts.view_accountsecret', 'retrieve': 'accounts.view_accountsecret', diff --git a/apps/tickets/serializers/ticket/apply_asset.py b/apps/tickets/serializers/ticket/apply_asset.py index 97c42f331..ac59ad13b 100644 --- a/apps/tickets/serializers/ticket/apply_asset.py +++ b/apps/tickets/serializers/ticket/apply_asset.py @@ -1,10 +1,10 @@ -from rest_framework import serializers from django.utils.translation import ugettext_lazy as _ +from rest_framework import serializers from assets.models import Asset, Node +from common.serializers.fields import ObjectRelatedField from perms.models import AssetPermission from perms.serializers.permission import ActionChoicesField -from common.serializers.fields import ObjectRelatedField from tickets.models import ApplyAssetTicket from .common import BaseApplyAssetSerializer from .ticket import TicketApplySerializer