Skip to content

Commit 9dd1422

Browse files
valentijnscholtenpna-nca
authored andcommitted
make ordering by sla_age safer
1 parent 582fa2d commit 9dd1422

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

dojo/finding/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,11 @@ def filter_findings_by_filter_name(self, findings: QuerySet[Finding]):
256256
return findings
257257

258258
def filter_findings_by_form(self, request: HttpRequest, findings: QuerySet[Finding]):
259+
# Apply default ordering if no ordering parameter is provided
260+
# This maintains backward compatibility with the previous behavior
261+
if not request.GET.get("o"):
262+
findings = findings.order_by(self.get_order_by())
263+
259264
# Set up the args for the form
260265
args = [request.GET, findings]
261266
# Set the initial form args
@@ -294,12 +299,7 @@ def get_filtered_findings(self):
294299

295300
def get_fully_filtered_findings(self, request: HttpRequest):
296301
findings = self.get_filtered_findings()
297-
filtered = self.filter_findings_by_form(request, findings)
298-
# Apply default ordering if no ordering parameter is provided
299-
# This maintains backward compatibility with the previous behavior
300-
if not request.GET.get("o"):
301-
filtered.qs = filtered.qs.order_by(self.get_order_by())
302-
return filtered
302+
return self.filter_findings_by_form(request, findings)
303303

304304

305305
class ListFindings(View, BaseListFindings):

0 commit comments

Comments
 (0)