From 72a50e37de7c1e3d19666ec8d93f48e36c935279 Mon Sep 17 00:00:00 2001 From: Manuel Sommer Date: Sat, 20 Jan 2024 15:00:27 +0100 Subject: [PATCH 1/2] fix deduplication tooltip --- dojo/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dojo/models.py b/dojo/models.py index 527d58aac2c..64fc8137167 100755 --- a/dojo/models.py +++ b/dojo/models.py @@ -274,10 +274,10 @@ class System_Settings(models.Model): default=False, blank=False, verbose_name=_('Deduplicate findings'), - help_text=_("With this setting turned on, Dojo deduplicates findings by " + help_text=_("With this setting turned on, DefectDojo deduplicates findings by " "comparing endpoints, cwe fields, and titles. " "If two findings share a URL and have the same CWE or " - "title, Dojo marks the less recent finding as a duplicate. " + "title, DefectDojo marks the recent finding as a duplicate. " "When deduplication is enabled, a list of " "deduplicated findings is added to the engagement view.")) delete_duplicates = models.BooleanField(default=False, blank=False, help_text=_("Requires next setting: maximum number of duplicates to retain.")) From dfd989ecaea1e66f4943e6bd8f06e8e6c7a3a86d Mon Sep 17 00:00:00 2001 From: Manuel Sommer Date: Mon, 22 Jan 2024 08:29:03 +0100 Subject: [PATCH 2/2] added db migration because of django --- ...ter_system_settings_enable_deduplication.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 dojo/db_migrations/0198_alter_system_settings_enable_deduplication.py diff --git a/dojo/db_migrations/0198_alter_system_settings_enable_deduplication.py b/dojo/db_migrations/0198_alter_system_settings_enable_deduplication.py new file mode 100644 index 00000000000..d9d477db75f --- /dev/null +++ b/dojo/db_migrations/0198_alter_system_settings_enable_deduplication.py @@ -0,0 +1,18 @@ +# Generated by Django 4.1.13 on 2024-01-21 22:20 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dojo', '0197_parser_merge'), + ] + + operations = [ + migrations.AlterField( + model_name='system_settings', + name='enable_deduplication', + field=models.BooleanField(default=False, help_text='With this setting turned on, Dojo deduplicates findings by comparing endpoints, cwe fields, and titles. If two findings share a URL and have the same CWE or title, Dojo marks the less recent finding as a duplicate. When deduplication is enabled, a list of deduplicated findings is added to the engagement view.', verbose_name='Deduplicate findings'), + ), + ]