Skip to content

fix deduplication tooltip #9375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
manuel-sommer wants to merge 3 commits into from
Closed

fix deduplication tooltip #9375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72a50e3
fix deduplication tooltip
manuel-sommer Jan 20, 2024
dfd989e
added db migration because of django
manuel-sommer Jan 22, 2024
699fd96
Merge branch 'dev' of github.com:DefectDojo/django-DefectDojo into fi…
Maffooch Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions dojo/db_migrations/0198_alter_system_settings_enable_deduplication.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'),
),
]
4 changes: 2 additions & 2 deletions dojo/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Expand Down