Skip to content

Commit 72806a7

Browse files
authored
make close_old_findings tooltip clearer when service is not set / empty (#13211)
1 parent 9acc3ce commit 72806a7

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

dojo/api_v2/serializers.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,14 +2314,16 @@ class ImportScanSerializer(CommonImportScanSerializer):
23142314
required=False,
23152315
default=False,
23162316
help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
2317-
"If service has been set, only the findings for this service will be closed. "
2317+
"If service has been set, only the findings for this service will be closed; "
2318+
"if no service is set, only findings without a service will be closed. "
23182319
"This only affects findings within the same engagement.",
23192320
)
23202321
close_old_findings_product_scope = serializers.BooleanField(
23212322
required=False,
23222323
default=False,
23232324
help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
2324-
"If service has been set, only the findings for this service will be closed. "
2325+
"If service has been set, only the findings for this service will be closed; "
2326+
"if no service is set, only findings without a service will be closed. "
23252327
"This only affects findings within the same product."
23262328
"By default, it is false meaning that only old findings of the same type in the engagement are in scope.",
23272329
)
@@ -2396,7 +2398,8 @@ class ReImportScanSerializer(CommonImportScanSerializer):
23962398
required=False,
23972399
default=True,
23982400
help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
2399-
"If service has been set, only the findings for this service will be closed. "
2401+
"If service has been set, only the findings for this service will be closed; "
2402+
"if no service is set, only findings without a service will be closed. "
24002403
"This only affects findings within the same test.",
24012404
)
24022405
close_old_findings_product_scope = serializers.BooleanField(

dojo/forms.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,13 +559,15 @@ class ImportScanForm(forms.Form):
559559
# Exposing the choice as two different check boxes.
560560
# If 'close_old_findings_product_scope' is selected, the backend will ensure that both flags are set.
561561
close_old_findings = forms.BooleanField(help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
562-
"If service has been set, only the findings for this service will be closed. "
562+
"If service has been set, only the findings for this service will be closed; "
563+
"if no service is set, only findings without a service will be closed. "
563564
"This affects findings within the same engagement by default.",
564565
label="Close old findings",
565566
required=False,
566567
initial=False)
567568
close_old_findings_product_scope = forms.BooleanField(help_text="Old findings no longer present in the new report get closed as mitigated when importing. "
568-
"If service has been set, only the findings for this service will be closed. "
569+
"If service has been set, only the findings for this service will be closed; "
570+
"if no service is set, only findings without a service will be closed. "
569571
"This affects findings within the same product.",
570572
label="Close old findings within this product",
571573
required=False,

0 commit comments

Comments
 (0)