From 03e3356844d6136e17371f6af577b55e30959592 Mon Sep 17 00:00:00 2001 From: valentijnscholten Date: Fri, 26 Dec 2025 09:46:49 +0100 Subject: [PATCH 1/2] Fix JIRA form processing logic --- dojo/finding/views.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dojo/finding/views.py b/dojo/finding/views.py index 76aec7ed405..50da077f57a 100644 --- a/dojo/finding/views.py +++ b/dojo/finding/views.py @@ -958,7 +958,7 @@ def process_finding_form(self, request: HttpRequest, finding: Finding, context: return finding, request, False - def process_jira_form(self, request: HttpRequest, finding: Finding, context: dict): + def process_jira_form(self, request: HttpRequest, finding: Finding, context: dict): # Capture case if the jira not being enabled if context["jform"] is None: return request, True, False @@ -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) @@ -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( From cb4fa399954ae6c11c9c994979ee6e2f328ed6e4 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Fri, 26 Dec 2025 09:51:09 +0100 Subject: [PATCH 2/2] ruff --- dojo/finding/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dojo/finding/views.py b/dojo/finding/views.py index 50da077f57a..4e7100014af 100644 --- a/dojo/finding/views.py +++ b/dojo/finding/views.py @@ -958,7 +958,7 @@ def process_finding_form(self, request: HttpRequest, finding: Finding, context: return finding, request, False - def process_jira_form(self, request: HttpRequest, finding: Finding, context: dict): + def process_jira_form(self, request: HttpRequest, finding: Finding, context: dict): # Capture case if the jira not being enabled if context["jform"] is None: return request, True, False