@@ -49,7 +49,6 @@ def get_context_data(self, **kwargs):
4949 request_query = self .request .GET
5050 context ["package_search_form" ] = PackageSearchForm (request_query )
5151 context ["search" ] = request_query .get ("search" )
52- context ["vulnerable_only" ] = request_query .get ("vulnerable_only" , "" )
5352 return context
5453
5554 def get_queryset (self , query = None ):
@@ -58,21 +57,25 @@ def get_queryset(self, query=None):
5857 Make a best effort approach to find matching packages either based
5958 on exact purl, partial purl or just name and namespace.
6059 """
61- form = PackageSearchForm (self .request .GET )
62- query = query or self .request .GET .get ("search" ) or ""
63-
60+ if query is not None :
61+ queryset = (
62+ self .model .objects .search (query )
63+ .with_vulnerability_counts ()
64+ .prefetch_related ()
65+ .order_by ("package_url" )
66+ )
67+ return queryset
68+ query = self .request .GET .get ("search" ) or ""
6469 queryset = (
6570 self .model .objects .search (query )
6671 .with_vulnerability_counts ()
6772 .prefetch_related ()
6873 .order_by ("package_url" )
6974 )
70-
71- if form .is_valid ():
72- vulnerable_only = form .cleaned_data .get ("vulnerable_only" , "" )
73- if vulnerable_only in ["true" , "false" ]:
74- queryset = queryset .with_is_vulnerable ()
75- queryset = queryset .filter (is_vulnerable = vulnerable_only == "true" )
75+ vulnerable_only = self .request .GET .get ("vulnerable_only" , "" )
76+ if vulnerable_only in ["true" , "false" ]:
77+ queryset = queryset .with_is_vulnerable ()
78+ queryset = queryset .filter (is_vulnerable = vulnerable_only == "true" )
7679
7780 return queryset
7881
0 commit comments