Merge branch 'DefectDojo:bugfix' into bugfix

Author: Jino-T

dojo/forms.py

@@ -342,10 +342,6 @@ class ProductForm(forms.ModelForm):
     product_manager = forms.ModelChoiceField(queryset=Dojo_User.objects.exclude(is_active=False).order_by("first_name", "last_name"), required=False)
     technical_contact = forms.ModelChoiceField(queryset=Dojo_User.objects.exclude(is_active=False).order_by("first_name", "last_name"), required=False)
     team_manager = forms.ModelChoiceField(queryset=Dojo_User.objects.exclude(is_active=False).order_by("first_name", "last_name"), required=False)
-    tags = TagField(
-        required=False,
-        help_text="Add tags that help describe this product. Choose from the list or add new tags. Press Enter key to add.",
-    )
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -1017,10 +1013,6 @@ class EngForm(forms.ModelForm):
         queryset=None,
         required=True, label="Testing Lead")
     test_strategy = forms.URLField(required=False, label="Test Strategy URL")
-    tags = TagField(
-        required=False,
-        help_text="Add tags that help describe this engagement. Choose from the list or add new tags. Press Enter key to add.",
-    )
 
     def __init__(self, *args, **kwargs):
         cicd = False
@@ -1103,10 +1095,6 @@ class TestForm(forms.ModelForm):
     lead = forms.ModelChoiceField(
         queryset=None,
         required=False, label="Testing Lead")
-    tags = TagField(
-        required=False,
-        help_text="Add tags that help describe this test. Choose from the list or add new tags. Press Enter key to add.",
-    )
 
     def __init__(self, *args, **kwargs):
         obj = None
@@ -1463,10 +1451,6 @@ class FindingForm(forms.ModelForm):
         choices=EFFORT_FOR_FIXING_CHOICES,
         error_messages={
             "invalid_choice": EFFORT_FOR_FIXING_INVALID_CHOICE})
-    tags = TagField(
-        required=False,
-        help_text="Add tags that help describe this finding. Choose from the list or add new tags. Press Enter key to add.",
-    )
 
     # the only reliable way without hacking internal fields to get predicatble ordering is to make it explicit
     field_order = ("title", "group", "date", "sla_start_date", "sla_expiration_date", "cwe", "vulnerability_ids", "severity", "cvss_info", "cvssv3",
@@ -1738,11 +1722,6 @@ class Meta:
 
 
 class EditEndpointForm(forms.ModelForm):
-    tags = TagField(
-        required=False,
-        help_text="Add tags that help describe this endpoint. Choose from the list or add new tags. Press Enter key to add.",
-    )
-
     class Meta:
         model = Endpoint
         exclude = ["product", "inherited_tags"]

dojo/utils.py

@@ -1604,7 +1604,8 @@ def calculate_grade(product, *args, **kwargs):
             product.prod_numeric_grade = prod_numeric_grade
             super(Product, product).save()
         else:
-            logger.debug("Product %s grade %i is up to date", product.id, prod_numeric_grade)
+            # Use %s to safely handle None grades without formatter errors
+            logger.debug("Product %s grade %s is up to date", product.id, prod_numeric_grade)
 
 
 def get_celery_worker_status():

requirements.txt

@@ -10,7 +10,7 @@ django-dbbackup==4.3.0
 django-environ==0.12.0
 django-filter==25.1
 django-imagekit==5.0.0
-django-multiselectfield==0.1.13
+django-multiselectfield==1.0.1
 django-polymorphic==4.1.0
 django-crispy-forms==2.4
 django_extensions==4.1
@@ -55,7 +55,8 @@ django-debug-toolbar==5.2.0
 django-debug-toolbar-request-history==0.1.4
 vcrpy==7.0.0
 vcrpy-unittest==0.1.7
-django-tagulous==2.1.1
+# do not upgrade to 2.1.1 - https://github.com/DefectDojo/django-DefectDojo/issues/12918
+django-tagulous==2.1.0
 PyJWT==2.10.1
 cvss==3.6
 django-fieldsignals==0.7.0