Skip to content

UI: Add AND logic for tag filtering #13789

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

Merged
mtesauro merged 1 commit into from
Dec 1, 2025
+50 −5
Merged

UI: Add AND logic for tag filtering #13789

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 50 additions & 5 deletions dojo/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,23 +532,68 @@ class FindingTagFilter(DojoFilter):
field_name="tags__name",
to_field_name="name",
queryset=Finding.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Findings by the selected tags")
help_text="Filter Findings by the selected tags (OR logic)",
)

tags_and = ModelMultipleChoiceFilter(
field_name="tags__name",
to_field_name="name",
queryset=Finding.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Findings by the selected tags (AND logic)",
label="Tags (AND)",
conjoined=True,
)

test__tags = ModelMultipleChoiceFilter(
field_name="test__tags__name",
to_field_name="name",
queryset=Test.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Tests by the selected tags")
help_text="Filter Findings by the selected Test tags (OR logic)",
label="Test Tags",
)

test__tags_and = ModelMultipleChoiceFilter(
field_name="test__tags__name",
to_field_name="name",
queryset=Test.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Findings by the selected Test tags (AND logic)",
label="Test Tags (AND)",
conjoined=True,
)

test__engagement__tags = ModelMultipleChoiceFilter(
field_name="test__engagement__tags__name",
to_field_name="name",
queryset=Engagement.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Engagements by the selected tags")
help_text="Filter Findings by the selected Engagement tags (OR logic)",
label="Engagement Tags",
)

test__engagement__tags_and = ModelMultipleChoiceFilter(
field_name="test__engagement__tags__name",
to_field_name="name",
queryset=Engagement.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Findings by the selected Engagement tags (AND logic)",
label="Engagement Tags (AND)",
conjoined=True,
)

test__engagement__product__tags = ModelMultipleChoiceFilter(
field_name="test__engagement__product__tags__name",
to_field_name="name",
queryset=Product.tags.tag_model.objects.all().order_by("name"),
label=labels.ASSET_FILTERS_TAGS_FILTER_LABEL,
help_text=labels.ASSET_FILTERS_TAGS_FILTER_HELP)
help_text="Filter Findings by the selected Product tags (OR logic)",
label="Product Tags",
)

test__engagement__product__tags_and = ModelMultipleChoiceFilter(
field_name="test__engagement__product__tags__name",
to_field_name="name",
queryset=Product.tags.tag_model.objects.all().order_by("name"),
help_text="Filter Findings by the selected Product tags (AND logic)",
label="Product Tags (AND)",
conjoined=True,
)

not_tags = ModelMultipleChoiceFilter(
field_name="tags__name",
Expand Down