Skip to content

fix #1754: newest-first sorting for packages + vulnerabilities #2147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shivamshrma09 wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

fix #1754: newest-first sorting for packages + vulnerabilities #2147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions vulnerabilities/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@ def get_queryset(self, query=None):
Return a Package queryset for the ``query``.
Make a best effort approach to find matching packages either based
on exact purl, partial purl or just name and namespace.
Results are sorted by version rank (newest first).
"""
query = query or self.request.GET.get("search") or ""
return (
self.model.objects.search(query)
.with_vulnerability_counts()
.prefetch_related()
.order_by("package_url")
.order_by("-version_rank", "package_url")
)


Expand All @@ -92,13 +93,14 @@ def get_queryset(self, query=None):
Return a Package queryset for the ``query``.
Make a best effort approach to find matching packages either based
on exact purl, partial purl or just name and namespace.
Results are sorted by version rank (newest first).
"""
query = query or self.request.GET.get("search") or ""
return (
self.model.objects.search(query)
.with_vulnerability_counts()
.prefetch_related()
.order_by("package_url")
.order_by("-version_rank", "package_url")
)


Expand All @@ -117,7 +119,7 @@ def get_context_data(self, **kwargs):

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


class AdvisorySearch(ListView):
Expand All @@ -135,7 +137,7 @@ def get_context_data(self, **kwargs):

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


class PackageDetails(DetailView):
Expand Down