diff --git a/dojo/filters.py b/dojo/filters.py index d77d1dada9a..8bc68a39e60 100644 --- a/dojo/filters.py +++ b/dojo/filters.py @@ -3128,21 +3128,38 @@ class Meta: class ApiRiskAcceptanceFilter(DojoFilter): + created = DateRangeFilter() + updated = DateRangeFilter() + o = OrderingFilter( # tuple-mapping retains order fields=( ("name", "name"), + ("created", "created"), + ("updated", "updated"), ), ) class Meta: model = Risk_Acceptance - fields = [ - "name", "accepted_findings", "recommendation", "recommendation_details", - "decision", "decision_details", "accepted_by", "owner", "expiration_date", - "expiration_date_warned", "expiration_date_handled", "reactivate_expired", - "restart_sla_expired", "notes", - ] + fields = { + "name": ["exact", "icontains"], + "accepted_findings": ["exact"], + "recommendation": ["exact"], + "recommendation_details": ["exact", "icontains"], + "decision": ["exact"], + "decision_details": ["exact", "icontains"], + "accepted_by": ["exact", "icontains"], + "owner": ["exact"], + "expiration_date": ["exact", "gt", "lt", "gte", "lte"], + "expiration_date_warned": ["exact", "gt", "lt", "gte", "lte"], + "expiration_date_handled": ["exact", "gt", "lt", "gte", "lte"], + "reactivate_expired": ["exact"], + "restart_sla_expired": ["exact"], + "notes": ["exact"], + "created": ["exact", "gt", "lt", "gte", "lte"], + "updated": ["exact", "gt", "lt", "gte", "lte"], + } class EngagementTestFilterHelper(FilterSet):