Preserve query in package search and improve views

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/templates/packages.html

@@ -21,18 +21,16 @@ <h1 class="title">
         </button>
       </div>
     </form>
+    {% if result_size %}
+      <p class="has-text-centered" id="result_count">{{result_size}} results</p>
+    {% elif result_size == 0 %}
+      <p class="has-text-centered" id="result_count">No results found</p>
+    {% endif %}
   </div>
 </div>
 
 {% if packages %}
 
-<section class="section is-small  has-text-centered">
-  <div class="container">
-    <h1 class="title">Results of your query</h1>
-    <h3 class="subtitle">Total Results {{ total_results }}</h3>
-  </div>
-</section>
-
 <section class="section">
   <div class="content is-medium">
     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">

vulnerabilities/templates/vulnerabilities.html

@@ -8,21 +8,21 @@ <h1 class="title">
 
 <div class="columns">
     <div class="column is-one-third is-offset-one-third">
-     <form action="{% url 'vulnerability_search' %}" method="get">
+    <form action="{% url 'vulnerability_search' %}" method="get">
       {% load widget_tweaks %}
       <div class="field is-horizontal">
-        {% with searched_for as query%}
-          {% render_field form.vuln_id class="input" value=query %}
-        {% endwith %}
+          {% render_field form.vuln_id class="input"%}
         <button class="button is-success", type="submit">
           Search
         </button>
       </div>
-      </form>
-      {% if searched_for %}
-      <p class="has-text-centered">{{result_size}} results</p>
-      {% endif %}
-       </div>
+    </form>
+    {% if result_size %}
+      <p class="has-text-centered" id="result_count">{{result_size}} results</p>
+    {% elif result_size == 0 %}
+      <p class="has-text-centered" id="result_count">No results found</p>
+    {% endif %}
+    </div>
 </div>
 
 {% if vulnerabilities %}
@@ -57,13 +57,6 @@ <h1 class="title">
 
     </section>
 
-{% elif result_size == 0 %}
-    <section class="section is-medium has-text-centered">
-      <div class="container">
-        <h1 class="title" id="results">No result found for "{{searched_for}}"</h1>
-      </div>
-    </section>
-
 {% endif %}
 
-{% endblock %}
+{% endblock %}

vulnerabilities/views.py

@@ -46,14 +46,14 @@ def get(self, request):
 
         if request.GET:
             packages = self.request_to_queryset(request)
-            total_results = packages.count()
+            result_size = packages.count()
             page_no = int(request.GET.get("page", 1))
             packages = Paginator(packages, 50).get_page(page_no)
             context["packages"] = packages
             context["searched_for"] = urlencode(
                 {param: request.GET[param] for param in request.GET if param != "page"}
             )
-            context["total_results"] = total_results
+            context["result_size"] = result_size
 
         return render(request, self.template_name, context)
 
@@ -74,14 +74,13 @@ class VulnerabilitySearchView(View):
     template_name = "vulnerabilities.html"
 
     def get(self, request):
-        context = {"form": forms.CVEForm()}
+        context = {"form": forms.CVEForm(request.GET or None)}
         if request.GET:
             vulnerabilities = self.request_to_queryset(request)
+            result_size = vulnerabilities.count()
             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("vuln_id")
             context["result_size"] = result_size
 
         return render(request, self.template_name, context)