Clarify JIRA accepted and false positives mappings (#12593)

* Clarify JIRA accepted and false positives mappings

* Clarify JIRA accepted and false positives mappings

* Clarify JIRA accepted and false positives mappings

* Update dojo/db_migrations/0230_alter_jira_instance_accepted_mapping_resolution_and_more.py

Co-authored-by: Harold Blankenship <36673698+hblankenship@users.noreply.github.com>

* sync with migration

---------

Co-authored-by: Harold Blankenship <36673698+hblankenship@users.noreply.github.com>

Author: valentijnscholten

dojo/db_migrations/0230_alter_jira_instance_accepted_mapping_resolution_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.8 on 2025-06-11 17:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0229_alter_finding_unique_id_from_tool'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='jira_instance',
+            name='accepted_mapping_resolution',
+            field=models.CharField(blank=True, verbose_name="Risk Accepted resolution mapping", help_text='JIRA issues that are closed in JIRA with one of these resolutions will result in the Finding becoming Risk Accepted in Defect Dojo. This Risk Acceptance will not have an expiration date. This mapping is not used when Findings are pushed to JIRA. In that case the Risk Accepted Findings are closed in JIRA and JIRA sets the default resolution.', max_length=300, null=True),
+        ),
+        migrations.AlterField(
+            model_name='jira_instance',
+            name='false_positive_mapping_resolution',
+            field=models.CharField(blank=True, verbose_name="False Positive resolution mapping", help_text='JIRA issues that are closed in JIRA with one of these resolutions will result in the Finding being marked as False Positive Defect Dojo. This mapping is not used when Findings are pushed to JIRA. In that case the Finding is closed in JIRA and JIRA sets the default resolution.', max_length=300, null=True),
+        ),
+    ]

dojo/models.py

@@ -3873,8 +3873,8 @@ class JIRA_Instance(models.Model):
     high_mapping_severity = models.CharField(max_length=200, help_text=_("Maps to the 'Priority' field in Jira. For example: High"))
     critical_mapping_severity = models.CharField(max_length=200, help_text=_("Maps to the 'Priority' field in Jira. For example: Critical"))
     finding_text = models.TextField(null=True, blank=True, help_text=_("Additional text that will be added to the finding in Jira. For example including how the finding was created or who to contact for more information."))
-    accepted_mapping_resolution = models.CharField(null=True, blank=True, max_length=300, help_text=_("JIRA resolution names (comma-separated values) that maps to an Accepted Finding"))
-    false_positive_mapping_resolution = models.CharField(null=True, blank=True, max_length=300, help_text=_("JIRA resolution names (comma-separated values) that maps to a False Positive Finding"))
+    accepted_mapping_resolution = models.CharField(null=True, blank=True, max_length=300, verbose_name="Risk Accepted resolution mapping", help_text=_("JIRA issues that are closed in JIRA with one of these resolutions will result in the Finding becoming Risk Accepted in Defect Dojo. This Risk Acceptance will not have an expiration date. This mapping is not used when Findings are pushed to JIRA. In that case the Risk Accepted Findings are closed in JIRA and JIRA sets the default resolution."))
+    false_positive_mapping_resolution = models.CharField(null=True, blank=True, verbose_name="False Positive resolution mapping", max_length=300, help_text=_("JIRA issues that are closed in JIRA with one of these resolutions will result in the Finding being marked as False Positive Defect Dojo. This mapping is not used when Findings are pushed to JIRA. In that case the Finding is closed in JIRA and JIRA sets the default resolution."))
     global_jira_sla_notification = models.BooleanField(default=True, blank=False, verbose_name=_("Globally send SLA notifications as comment?"), help_text=_("This setting can be overidden at the Product level"))
     finding_jira_sync = models.BooleanField(default=False, blank=False, verbose_name=_("Automatically sync Findings with JIRA?"), help_text=_("If enabled, this will sync changes to a Finding automatically to JIRA"))