Skip to content

Fix JIRA form processing logic to not skip pushing new findings when finding_jira_sync is enabled #13983

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
Maffooch merged 2 commits into from
Dec 29, 2025
Merged

Fix JIRA form processing logic to not skip pushing new findings when finding_jira_sync is enabled #13983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03e3356
Fix JIRA form processing logic
valentijnscholten Dec 26, 2025
cb4fa39
ruff
valentijnscholten Dec 26, 2025
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
9 changes: 2 additions & 7 deletions dojo/finding/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -968,8 +968,9 @@ def process_jira_form(self, request: HttpRequest, finding: Finding, context: dic
logger.debug("jform.jira_issue: %s", context["jform"].cleaned_data.get("jira_issue"))
logger.debug(JFORM_PUSH_TO_JIRA_MESSAGE, context["jform"].cleaned_data.get("push_to_jira"))
# can't use helper as when push_all_jira_issues is True, the checkbox gets disabled and is always false
push_to_jira_checkbox = context["jform"].cleaned_data.get("push_to_jira")
push_all_jira_issues = jira_helper.is_push_all_issues(finding)
push_to_jira = push_all_jira_issues or context["jform"].cleaned_data.get("push_to_jira")
push_to_jira = push_all_jira_issues or push_to_jira_checkbox or jira_helper.is_keep_in_sync_with_jira(finding)
logger.debug("push_to_jira: %s", push_to_jira)
logger.debug("push_all_jira_issues: %s", push_all_jira_issues)
logger.debug("has_jira_group_issue: %s", finding.has_jira_group_issue)
Expand All @@ -996,12 +997,6 @@ def process_jira_form(self, request: HttpRequest, finding: Finding, context: dic
jira_helper.finding_link_jira(request, finding, new_jira_issue_key)
jira_message = "Linked a JIRA issue successfully."
# any existing finding should be updated
jira_instance = jira_helper.get_jira_instance(finding)
push_to_jira = (
push_to_jira
and not (push_to_jira and finding.finding_group)
and (finding.has_jira_issue or (jira_instance and jira_instance.finding_jira_sync))
)
# Determine if a message should be added
if jira_message:
messages.add_message(
Expand Down