Merge pull request #257 from sbs2001/fix_ui

 Fix UI bug with vulnerability search view's pagination

Author: sbs2001

vulnerabilities/forms.py

@@ -53,4 +53,4 @@ class PackageForm(forms.Form):
 
 class CVEForm(forms.Form):
 
-    cve_id = forms.CharField(widget=forms.TextInput(attrs={"placeholder": "vulnerability id"}))
+    vuln_id = forms.CharField(widget=forms.TextInput(attrs={"placeholder": "vulnerability id"}))

vulnerabilities/templates/vulnerabilities.html

@@ -12,7 +12,7 @@ <h1 class="title">
      <form action="{% url 'vulnerability_search' %}" method="get">
       {% load widget_tweaks %}
       <div class="field is-horizontal">
-        {{form.cve_id|add_class:"input"}}
+        {{form.vuln_id|add_class:"input"}}
         <button class="button is-success", type="submit">
           Search
         </button>
@@ -25,7 +25,7 @@ <h1 class="title">
     <section class="section is-medium has-text-centered">
       <div class="container">
         <h1 class="title" id="results">Results of your query "{{searched_for}}"</h1>
-        <h3 class="subtitle" id="results">Total {{vulnerabilities|length}} results</h3>
+        <h3 class="subtitle" id="results">Total {{result_size}} results</h3>
       </div>
     </section>
 

vulnerabilities/views.py

@@ -75,17 +75,18 @@ def get(self, request):
         if request.GET:
             vulnerabilities = self.request_to_queryset(request)
             pages = Paginator(vulnerabilities, 50)
+            result_size = pages.count
             vulnerabilities = pages.get_page(int(self.request.GET.get("page", 1)))
             context["vulnerabilities"] = vulnerabilities
-            context["searched_for"] = request.GET.get("cve_id")
+            context["searched_for"] = request.GET.get("vuln_id")
+            context["result_size"] = result_size
 
         return render(request, self.template_name, context)
 
     @staticmethod
     def request_to_queryset(request):
-        if request.GET["cve_id"]:
-            cve_id = request.GET["cve_id"]
-            return models.Vulnerability.objects.filter(cve_id__contains=cve_id)
+        vuln_id = request.GET["vuln_id"]
+        return models.Vulnerability.objects.filter(cve_id__contains=vuln_id)
 
 
 class PackageUpdate(UpdateView):