Skip to content

Commit 657a913

Browse files
shivamshrma09shivamshrma09
authored andcommitted
fix #1754: newest-first sorting for packages + vulnerabilities
- packages: version_rank desc - vulns: vulnerability_id desc - advisories: advisory_id desc Signed-off-by: shivamshrma09 <shivamsharma27107@gmail.com>
1 parent 74172c4 commit 657a913

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

vulnerabilities/views.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,14 @@ def get_queryset(self, query=None):
6767
Return a Package queryset for the ``query``.
6868
Make a best effort approach to find matching packages either based
6969
on exact purl, partial purl or just name and namespace.
70+
Results are sorted by version rank (newest first).
7071
"""
7172
query = query or self.request.GET.get("search") or ""
7273
return (
7374
self.model.objects.search(query)
7475
.with_vulnerability_counts()
7576
.prefetch_related()
76-
.order_by("package_url")
77+
.order_by("-version_rank", "package_url")
7778
)
7879

7980

@@ -95,13 +96,14 @@ def get_queryset(self, query=None):
9596
Return a Package queryset for the ``query``.
9697
Make a best effort approach to find matching packages either based
9798
on exact purl, partial purl or just name and namespace.
99+
Results are sorted by version rank (newest first).
98100
"""
99101
query = query or self.request.GET.get("search") or ""
100102
return (
101103
self.model.objects.search(query)
102104
.with_vulnerability_counts()
103105
.prefetch_related()
104-
.order_by("package_url")
106+
.order_by("-version_rank", "package_url")
105107
)
106108

107109

@@ -120,7 +122,7 @@ def get_context_data(self, **kwargs):
120122

121123
def get_queryset(self, query=None):
122124
query = query or self.request.GET.get("search") or ""
123-
return self.model.objects.search(query=query).with_package_counts()
125+
return self.model.objects.search(query=query).with_package_counts().order_by("-vulnerability_id")
124126

125127

126128
class AdvisorySearch(ListView):
@@ -138,7 +140,7 @@ def get_context_data(self, **kwargs):
138140

139141
def get_queryset(self, query=None):
140142
query = query or self.request.GET.get("search") or ""
141-
return self.model.objects.search(query=query).with_package_counts()
143+
return self.model.objects.search(query=query).with_package_counts().order_by("-advisory_id")
142144

143145

144146
class PackageDetails(DetailView):

0 commit comments

Comments
 (0)