mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-06-22 13:07:26 +00:00
fix: Job audit: Search job list, filter failures based on command
This commit is contained in:
parent
dc5883576d
commit
d2c6e3c7a6
@ -64,8 +64,8 @@ class JobLogAuditViewSet(OrgReadonlyModelViewSet):
|
|||||||
|
|
||||||
class JobsAuditViewSet(OrgModelViewSet):
|
class JobsAuditViewSet(OrgModelViewSet):
|
||||||
model = Job
|
model = Job
|
||||||
search_fields = ['creator__name']
|
search_fields = ['creator__name', 'args', 'name']
|
||||||
filterset_fields = ['creator__name']
|
filterset_fields = ['creator__name', 'args', 'name']
|
||||||
serializer_class = JobsAuditSerializer
|
serializer_class = JobsAuditSerializer
|
||||||
ordering = ['-is_periodic', '-date_updated']
|
ordering = ['-is_periodic', '-date_updated']
|
||||||
http_method_names = ['get', 'options', 'patch']
|
http_method_names = ['get', 'options', 'patch']
|
||||||
|
@ -35,14 +35,13 @@ class JobLogSerializer(JobExecutionSerializer):
|
|||||||
|
|
||||||
|
|
||||||
class JobsAuditSerializer(JobSerializer):
|
class JobsAuditSerializer(JobSerializer):
|
||||||
material = serializers.ReadOnlyField(label=_("Command"))
|
|
||||||
summary = serializers.ReadOnlyField(label=_("Summary"))
|
summary = serializers.ReadOnlyField(label=_("Summary"))
|
||||||
crontab = serializers.ReadOnlyField(label=_("Execution cycle"))
|
crontab = serializers.ReadOnlyField(label=_("Execution cycle"))
|
||||||
is_periodic_display = serializers.BooleanField(read_only=True, source='is_periodic')
|
is_periodic_display = serializers.BooleanField(read_only=True, source='is_periodic')
|
||||||
|
|
||||||
class Meta(JobSerializer.Meta):
|
class Meta(JobSerializer.Meta):
|
||||||
read_only_fields = [
|
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'
|
'is_periodic_display'
|
||||||
]
|
]
|
||||||
fields = read_only_fields + ['is_periodic']
|
fields = read_only_fields + ['is_periodic']
|
||||||
|
Loading…
Reference in New Issue
Block a user