Merge pull request DefectDojo#674 from benghaun/bugfix

aaronweaver · web-flow · commit 77c8a850f133 · 2018-08-03T11:08:58.000-04:00
bugfix for templated findings and empty component handling
diff --git a/dojo/test/views.py b/dojo/test/views.py
@@ -320,7 +320,8 @@ def add_temp_finding(request, tid, fid):
             new_finding.save()
             if 'jiraform-push_to_jira' in request.POST:
                     jform = JIRAFindingForm(request.POST, prefix='jiraform', enabled=True)
-                    add_issue_task.delay(new_finding, jform.cleaned_data.get('push_to_jira'))
+                    if jform.is_valid():
+                        add_issue_task.delay(new_finding, jform.cleaned_data.get('push_to_jira'))
             messages.add_message(request,
                                  messages.SUCCESS,
                                  'Finding from template added successfully.',
diff --git a/dojo/utils.py b/dojo/utils.py
@@ -1077,7 +1077,7 @@ def update_issue(find, old_status, push_to_jira):
                 log_jira_alert(
                     "Component not updated, exists in Jira already. Update from Jira instead.",
                     find)
-            else:
+            elif jpkey.component:
                 # Add component to the Jira issue
                 component = [
                     {

Original file line number	Diff line number	Diff line change
`@@ -1077,7 +1077,7 @@ def update_issue(find, old_status, push_to_jira):`
`1077`	`1077`	`log_jira_alert(`
`1078`	`1078`	`"Component not updated, exists in Jira already. Update from Jira instead.",`
`1079`	`1079`	`find)`
`1080`		`- else:`
	`1080`	`+ elif jpkey.component:`
`1081`	`1081`	`# Add component to the Jira issue`
`1082`	`1082`	`component = [`
`1083`	`1083`	`{`