From d2c6e3c7a61ebdf1a1ebef3f995e47fa890bcbc8 Mon Sep 17 00:00:00 2001 From: wangruidong <940853815@qq.com> Date: Mon, 31 Mar 2025 15:16:40 +0800 Subject: [PATCH] fix: Job audit: Search job list, filter failures based on command --- apps/audits/api.py | 4 ++-- apps/audits/serializers.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/audits/api.py b/apps/audits/api.py index 67836b635..856bcccf9 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -64,8 +64,8 @@ class JobLogAuditViewSet(OrgReadonlyModelViewSet): class JobsAuditViewSet(OrgModelViewSet): model = Job - search_fields = ['creator__name'] - filterset_fields = ['creator__name'] + search_fields = ['creator__name', 'args', 'name'] + filterset_fields = ['creator__name', 'args', 'name'] serializer_class = JobsAuditSerializer ordering = ['-is_periodic', '-date_updated'] http_method_names = ['get', 'options', 'patch'] diff --git a/apps/audits/serializers.py b/apps/audits/serializers.py index 631c54c3c..f7c0fe160 100644 --- a/apps/audits/serializers.py +++ b/apps/audits/serializers.py @@ -35,14 +35,13 @@ class JobLogSerializer(JobExecutionSerializer): class JobsAuditSerializer(JobSerializer): - material = serializers.ReadOnlyField(label=_("Command")) summary = serializers.ReadOnlyField(label=_("Summary")) crontab = serializers.ReadOnlyField(label=_("Execution cycle")) is_periodic_display = serializers.BooleanField(read_only=True, source='is_periodic') class Meta(JobSerializer.Meta): read_only_fields = [ - "id", 'name', 'args', 'material', 'type', 'crontab', 'interval', 'date_last_run', 'summary', 'created_by', + "id", 'name', 'args', 'type', 'crontab', 'interval', 'date_last_run', 'summary', 'created_by', 'is_periodic_display' ] fields = read_only_fields + ['is_periodic']