Skip to content

Fix UI bug with vulnerability search view's pagination #257

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

Merged
merged 1 commit into from
Sep 21, 2020
Merged

Fix UI bug with vulnerability search view's pagination #257

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion vulnerabilities/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}))
4 changes: 2 additions & 2 deletions vulnerabilities/templates/vulnerabilities.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand Down
9 changes: 5 additions & 4 deletions vulnerabilities/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down