From fcce03f7bdf6475ceec5ccb01f0ba5484f85ccff Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Tue, 14 Nov 2023 12:48:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E5=AF=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A4=B1=E8=B4=A5=20(#12098)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: feng <1304903146@qq.com> --- apps/accounts/api/automations/change_secret.py | 3 +-- apps/accounts/filters.py | 9 +-------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/apps/accounts/api/automations/change_secret.py b/apps/accounts/api/automations/change_secret.py index 79df60c55..f1c522fc4 100644 --- a/apps/accounts/api/automations/change_secret.py +++ b/apps/accounts/api/automations/change_secret.py @@ -13,7 +13,6 @@ from .base import ( AutomationAssetsListApi, AutomationRemoveAssetApi, AutomationAddAssetApi, AutomationNodeAddRemoveApi, AutomationExecutionViewSet ) -from ...filters import ChangeSecretRecordFilterSet __all__ = [ 'ChangeSecretAutomationViewSet', 'ChangeSecretRecordViewSet', @@ -32,7 +31,7 @@ class ChangeSecretAutomationViewSet(OrgBulkModelViewSet): class ChangeSecretRecordViewSet(mixins.ListModelMixin, OrgGenericViewSet): serializer_class = serializers.ChangeSecretRecordSerializer - filterset_class = ChangeSecretRecordFilterSet + filterset_fields = ('asset_id', 'execution_id') search_fields = ('asset__address',) tp = AutomationTypes.change_secret rbac_perms = { diff --git a/apps/accounts/filters.py b/apps/accounts/filters.py index fe05c78dd..e71a5b9fb 100644 --- a/apps/accounts/filters.py +++ b/apps/accounts/filters.py @@ -5,7 +5,7 @@ from django_filters import rest_framework as drf_filters from assets.models import Node from common.drf.filters import BaseFilterSet -from .models import Account, GatheredAccount, ChangeSecretRecord +from .models import Account, GatheredAccount class AccountFilterSet(BaseFilterSet): @@ -59,10 +59,3 @@ class GatheredAccountFilterSet(BaseFilterSet): class Meta: model = GatheredAccount fields = ['id', 'asset_id', 'username'] - - -class ChangeSecretRecordFilterSet(BaseFilterSet): - - class Meta: - model = ChangeSecretRecord - fields = ['asset_id', 'execution_id']