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

fix: 改密记录搜索失败 (#12098) 

Co-authored-by: feng <1304903146@qq.com>
pull/12100/head
fit2bot 2023-11-14 12:48:02 +08:00 committed by GitHub
parent 5f121934a7
commit fcce03f7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/accounts/api/automations/change_secret.py
View File

@ -13,7 +13,6 @@ from .base import (
AutomationAssetsListApi, AutomationRemoveAssetApi, AutomationAddAssetApi, AutomationAssetsListApi, AutomationRemoveAssetApi, AutomationAddAssetApi,
AutomationNodeAddRemoveApi, AutomationExecutionViewSet AutomationNodeAddRemoveApi, AutomationExecutionViewSet
) )
from ...filters import ChangeSecretRecordFilterSet
__all__ = [ __all__ = [
'ChangeSecretAutomationViewSet', 'ChangeSecretRecordViewSet', 'ChangeSecretAutomationViewSet', 'ChangeSecretRecordViewSet',
@ -32,7 +31,7 @@ class ChangeSecretAutomationViewSet(OrgBulkModelViewSet):
class ChangeSecretRecordViewSet(mixins.ListModelMixin, OrgGenericViewSet): class ChangeSecretRecordViewSet(mixins.ListModelMixin, OrgGenericViewSet):
serializer_class = serializers.ChangeSecretRecordSerializer serializer_class = serializers.ChangeSecretRecordSerializer
filterset_class = ChangeSecretRecordFilterSet filterset_fields = ('asset_id', 'execution_id')
search_fields = ('asset__address',) search_fields = ('asset__address',)
tp = AutomationTypes.change_secret tp = AutomationTypes.change_secret
rbac_perms = { rbac_perms = {

9
apps/accounts/filters.py
View File

@ -5,7 +5,7 @@ from django_filters import rest_framework as drf_filters
from assets.models import Node from assets.models import Node
from common.drf.filters import BaseFilterSet from common.drf.filters import BaseFilterSet
from .models import Account, GatheredAccount, ChangeSecretRecord from .models import Account, GatheredAccount
class AccountFilterSet(BaseFilterSet): class AccountFilterSet(BaseFilterSet):
@ -59,10 +59,3 @@ class GatheredAccountFilterSet(BaseFilterSet):
class Meta: class Meta:
model = GatheredAccount model = GatheredAccount
fields = ['id', 'asset_id', 'username'] fields = ['id', 'asset_id', 'username']
class ChangeSecretRecordFilterSet(BaseFilterSet):
class Meta:
model = ChangeSecretRecord
fields = ['asset_id', 'execution_id']