fix mitigated filter on UI and enhanced naming for on & after at API

DefectDojo · Jun 19, 2024 · 1b421fe · 1b421fe
1 parent 4463582
commit 1b421fe
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/dojo/filters.py b/dojo/filters.py
@@ -1416,9 +1416,9 @@ class ApiFindingFilter(DojoFilter):
     # DateRangeFilter
     created = DateRangeFilter()
     date = DateRangeFilter()
-    on = DateFilter(field_name='date', lookup_expr='exact')
-    before = DateFilter(field_name='date', lookup_expr='lt')
-    after = DateFilter(field_name='date', lookup_expr='gt')
+    discovered_on = DateFilter(field_name='date', lookup_expr='exact')
+    discovered_before = DateFilter(field_name='date', lookup_expr='lt')
+    discovered_after = DateFilter(field_name='date', lookup_expr='gt')
     jira_creation = DateRangeFilter(field_name='jira_issue__jira_creation')
     jira_change = DateRangeFilter(field_name='jira_issue__jira_change')
     last_reviewed = DateRangeFilter()
@@ -1553,8 +1553,8 @@ class FindingFilterHelper(FilterSet):
     severity = MultipleChoiceFilter(choices=SEVERITY_CHOICES)
     duplicate = ReportBooleanFilter()
     is_mitigated = ReportBooleanFilter()
-    mitigated_date = DateFromToRangeFilter(field_name='mitigated_date', label="Mitigated Date")
-    mitigated_on = DateFilter(field_name="mitigated_date", lookup_expr="exact", label="Mitigated On")
+    mitigated_date = DateFromToRangeFilter(field_name='mitigated', label="Mitigated Date")
+    mitigated_on = DateFilter(field_name="mitigated", lookup_expr="exact", label="Mitigated On")
     planned_remediation_date = DateRangeOmniFilter()
     planned_remediation_version = CharFilter(lookup_expr="icontains", label=_("Planned remediation version"))
     file_path = CharFilter(lookup_expr="icontains")