github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 账号模版 protocols 过滤

pull/10337/head
ibuler 2023-04-21 16:58:40 +08:00 committed by Jiangjie.Bai
parent f1ee454254
commit a105748a55
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/accounts/api/account/template.py
View File

@ -1,13 +1,13 @@
from django_filters import rest_framework as drf_filters from django_filters import rest_framework as drf_filters
from assets.const import Protocol
from accounts import serializers from accounts import serializers
from accounts.models import AccountTemplate from accounts.models import AccountTemplate
from orgs.mixins.api import OrgBulkModelViewSet from assets.const import Protocol
from rbac.permissions import RBACPermission from common.drf.filters import BaseFilterSet
from common.permissions import UserConfirmation, ConfirmType from common.permissions import UserConfirmation, ConfirmType
from common.views.mixins import RecordViewLogMixin 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): class AccountTemplateFilterSet(BaseFilterSet):
@ -27,6 +27,8 @@ class AccountTemplateFilterSet(BaseFilterSet):
continue continue
_st = protocol_secret_type_map[p].get('secret_types', []) _st = protocol_secret_type_map[p].get('secret_types', [])
secret_types.update(_st) secret_types.update(_st)
if not secret_types:
secret_types = ['password']
queryset = queryset.filter(secret_type__in=secret_types) queryset = queryset.filter(secret_type__in=secret_types)
return queryset return queryset

6
apps/assets/const/custom.py
View File

@ -48,11 +48,7 @@ class CustomTypes(BaseType):
@classmethod @classmethod
def internal_platforms(cls): def internal_platforms(cls):
return { return {}
# cls.PUBLIC: [],
# cls.PRIVATE: [{'name': 'Vmware-vSphere'}],
# cls.K8S: [{'name': 'Kubernetes'}],
}
@classmethod @classmethod
def get_custom_platforms(cls): def get_custom_platforms(cls):