From a105748a555e6c3b72ebc30e3e4260f6a73290b1 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 21 Apr 2023 16:58:40 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E6=A8=A1=E7=89=88=20?= =?UTF-8?q?protocols=20=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/accounts/api/account/template.py | 10 ++++++---- apps/assets/const/custom.py | 6 +----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/accounts/api/account/template.py b/apps/accounts/api/account/template.py index 3bbe902ae..11675368f 100644 --- a/apps/accounts/api/account/template.py +++ b/apps/accounts/api/account/template.py @@ -1,13 +1,13 @@ from django_filters import rest_framework as drf_filters -from assets.const import Protocol from accounts import serializers from accounts.models import AccountTemplate -from orgs.mixins.api import OrgBulkModelViewSet -from rbac.permissions import RBACPermission +from assets.const import Protocol +from common.drf.filters import BaseFilterSet from common.permissions import UserConfirmation, ConfirmType from common.views.mixins import RecordViewLogMixin -from common.drf.filters import BaseFilterSet +from orgs.mixins.api import OrgBulkModelViewSet +from rbac.permissions import RBACPermission class AccountTemplateFilterSet(BaseFilterSet): @@ -27,6 +27,8 @@ class AccountTemplateFilterSet(BaseFilterSet): continue _st = protocol_secret_type_map[p].get('secret_types', []) secret_types.update(_st) + if not secret_types: + secret_types = ['password'] queryset = queryset.filter(secret_type__in=secret_types) return queryset diff --git a/apps/assets/const/custom.py b/apps/assets/const/custom.py index 9046a3069..5c72127b3 100644 --- a/apps/assets/const/custom.py +++ b/apps/assets/const/custom.py @@ -48,11 +48,7 @@ class CustomTypes(BaseType): @classmethod def internal_platforms(cls): - return { - # cls.PUBLIC: [], - # cls.PRIVATE: [{'name': 'Vmware-vSphere'}], - # cls.K8S: [{'name': 'Kubernetes'}], - } + return {} @classmethod def get_custom_platforms(cls):