Add a clean method for form validation #98

Signed-off-by: tdruez <tdruez@nexb.com>
aboutcode-org · Nov 29, 2024 · 1fe4c2c · 1fe4c2c
1 parent b50365f
commit 1fe4c2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/product_portfolio/forms.py b/product_portfolio/forms.py
@@ -990,3 +990,10 @@ def helper(self):
         helper.modal_title = "Vulnerability analysis"
         helper.modal_id = "vulnerability-analysis-modal"
         return helper
+
+    def clean(self):
+        main_fields = ["state", "justification", "responses", "detail"]
+        if not any(self.cleaned_data.get(field_name) for field_name in main_fields):
+            raise ValidationError(
+                "At least one of state, justification, responses or detail must be provided."
+            )
diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html
@@ -119,7 +119,9 @@
   {% if tabsets.Imports %}
     {% include 'product_portfolio/includes/scancode_project_status_modal.html' %}
   {% endif %}
-  {% include 'product_portfolio/modals/vulnerability_analysis_modal.html' %}
+  {% if request.user.dataspace.enable_vulnerablecodedb_access and not tabsets.Vulnerabilities.disabled %}
+    {% include 'product_portfolio/modals/vulnerability_analysis_modal.html' %}
+  {% endif %}
 {% endblock %}
 
 {% block extrastyle %}
@@ -233,7 +235,7 @@
     </script>
   {% endif %}
 
-  {% if request.user.dataspace.enable_vulnerablecodedb_access %}
+  {% if request.user.dataspace.enable_vulnerablecodedb_access and not tabsets.Vulnerabilities.disabled %}
     <script>
       $(document).ready(function () {
         let vulnerability_modal = $('#vulnerability-analysis-modal');