Spell out vulnerability over vuln in forms #798

Reference: #798
Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

vulnerabilities/forms.py

@@ -38,7 +38,7 @@ class PackageForm(forms.Form):
     )
 
 
-class CVEForm(forms.Form):
+class VulnerabilityForm(forms.Form):
 
     vuln_id = forms.CharField(
         required=False,

vulnerabilities/templates/index.html

@@ -104,10 +104,10 @@
         </div>
         <div class="panel-block">
             <div class="pb-3 width-100-pct">
-                <form action="{% url 'vulnerability_search' %}" method="get" name="vuln_form" onsubmit="return validateVulnForm()">
+                <form action="{% url 'vulnerability_search' %}" method="get" name="vulnerability_form" onsubmit="return validateVulnForm()">
                     <div class="field has-addons mt-3">
                         <div class="control width-100-pct">
-                            {% render_field vuln_form.vuln_id class="input" %}
+                            {% render_field vulnerability_form.vuln_id class="input" %}
                         </div>
                         <div class="control">
                             <button class="button is-link" type="submit" id="submit_vuln">
@@ -151,7 +151,7 @@
     }
 
     function validateVulnForm() {
-        var x = document.forms["vuln_form"]["vuln_id"].value;
+        var x = document.forms["vulnerability_form"]["vuln_id"].value;
         if (x.trim().length == "") {
             return false;
         }

vulnerabilities/templates/vulnerabilities.html

@@ -41,10 +41,10 @@
         </div>
         <div class="panel-block">
             <div class="pb-3 width-100-pct">
-                <form action="{% url 'vulnerability_search' %}" method="get" name="vuln_form" onsubmit="return validateVulnForm()">
+                <form action="{% url 'vulnerability_search' %}" method="get" name="vulnerability_form" onsubmit="return validateVulnForm()">
                     <div class="field has-addons mt-3">
                         <div class="control width-100-pct">
-                            {% render_field vuln_form.vuln_id class="input" %}
+                            {% render_field vulnerability_form.vuln_id class="input" %}
                         </div>
                         <div class="control">
                             <button class="button is-link" type="submit" id="submit_vuln" name="template" value="vulnerabilities">
@@ -203,7 +203,7 @@
     });
 
     function validateVulnForm() {
-        var x = document.forms["vuln_form"]["vuln_id"].value;
+        var x = document.forms["vulnerability_form"]["vuln_id"].value;
         if (x.trim().length == "") {
             return false;
         }

vulnerabilities/templates/vulnerability.html

@@ -41,10 +41,10 @@
         </div>
         <div class="panel-block">
             <div class="pb-3 width-100-pct">
-                <form action="{% url 'vulnerability_search' %}" method="get" name="vuln_form" onsubmit="return validateVulnForm()">
+                <form action="{% url 'vulnerability_search' %}" method="get" name="vulnerability_form" onsubmit="return validateVulnForm()">
                     <div class="field has-addons mt-3">
                         <div class="control width-100-pct">
-                            {% render_field vuln_form.vuln_id class="input" %}
+                            {% render_field vulnerability_form.vuln_id class="input" %}
                         </div>
                         <div class="control">
                             <button class="button is-link" type="submit" id="submit_vuln" name="template" value="vulnerability_details">
@@ -381,7 +381,7 @@
     });
 
     function validateVulnForm() {
-        var x = document.forms["vuln_form"]["vuln_id"].value;
+        var x = document.forms["vulnerability_form"]["vuln_id"].value;
         if (x.trim().length == "") {
             return false;
         }

vulnerabilities/views.py

@@ -25,7 +25,7 @@
 
 from vulnerabilities import forms
 from vulnerabilities import models
-from vulnerabilities.forms import CVEForm
+from vulnerabilities.forms import VulnerabilityForm
 from vulnerabilities.forms import PackageForm
 
 
@@ -80,12 +80,12 @@ def get(self, request):
                     return render(request, "package_update.html", context)
                 elif request.GET.get("template") == "index":
                     context["package_form"] = PackageForm(request.GET or None)
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "index.html"
                     return render(request, "index.html", context)
                 else:
                     context["package_form"] = PackageForm(request.GET or None)
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "index.html"
                     return render(request, "index.html", context)
 
@@ -172,25 +172,25 @@ def get(self, request):
                 }
 
                 if request.GET.get("template") == "vulnerabilities":
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "vulnerabilities.html"
                     return render(request, "vulnerabilities.html", context)
                 elif request.GET.get("template") == "vulnerability_details":
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "vulnerability.html"
                     return render(request, "vulnerability.html", context)
                 elif request.GET.get("template") == "index":
                     context["package_form"] = PackageForm(request.GET or None)
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "index.html"
                     return render(request, "index.html", context)
                 else:
                     context["package_form"] = PackageForm(request.GET or None)
-                    context["vuln_form"] = CVEForm(request.GET or None)
+                    context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
                     context["template_name"] = "index.html"
                     return render(request, "index.html", context)
 
-        context["vuln_form"] = CVEForm(request.GET or None)
+        context["vulnerability_form"] = VulnerabilityForm(request.GET or None)
         context["template_name"] = self.template_name
         return render(request, self.template_name, context)
 
@@ -300,7 +300,7 @@ def get_context_data(self, **kwargs):
         vulnerability_list_count = len(vulnerability_list)
         context["vulnerability_list_count"] = vulnerability_list_count
 
-        context["vuln_form"] = CVEForm(self.request.GET or None)
+        context["vulnerability_form"] = VulnerabilityForm(self.request.GET or None)
         context["template_name"] = self.template_name
 
         severity_list = []
@@ -322,7 +322,7 @@ class HomePage(View):
 
     def get(self, request):
         context = {
-            "vuln_form": CVEForm(request.GET or None),
+            "vulnerability_form": VulnerabilityForm(request.GET or None),
             "package_form": PackageForm(request.GET or None),
             "template_name": self.template_name,
             "debug_ui": settings.DEBUG_UI,