From 85699106581e473aff0e43f516f31ba37d5c7e1d Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 5 Jun 2020 14:07:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20command=20exexution=20audit=20log?= =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/asset.py | 3 --- apps/audits/api.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/apps/assets/api/asset.py b/apps/assets/api/asset.py index b5356af16..c5ee613e2 100644 --- a/apps/assets/api/asset.py +++ b/apps/assets/api/asset.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # -import random - -from rest_framework.response import Response from rest_framework.viewsets import ModelViewSet from rest_framework.generics import RetrieveAPIView from django.shortcuts import get_object_or_404 diff --git a/apps/audits/api.py b/apps/audits/api.py index c6c648f5c..162d50977 100644 --- a/apps/audits/api.py +++ b/apps/audits/api.py @@ -92,8 +92,8 @@ class CommandExecutionViewSet(ListModelMixin, OrgGenericViewSet): date_range_filter_fields = [ ('date_start', ('date_from', 'date_to')) ] - filter_fields = ['user__name', 'command', 'run_as__name'] - search_fields = ['command'] + filter_fields = ['user__name', 'command', 'run_as__name', 'is_finished'] + search_fields = ['command', 'user__name', 'run_as__name'] ordering = ['-date_created'] -- GitLab