Merge pull request DefectDojo#1502 from Maffooch/jira_cols

devGregA · web-flow · commit f5146dfd875a · 2019-08-19T09:28:52.000-05:00
Correct overlooked error in DefectDojo#1498
diff --git a/dojo/finding/views.py b/dojo/finding/views.py
@@ -121,11 +121,11 @@ def open_findings(request, pid=None, eid=None, view=None):
     if pid:
         show_product_column = False
         product_tab = Product_Tab(pid, title="Findings", tab="findings")
-        jira_config = JIRA_PKey.objects.filter(product=pid)[0].conf_id
+        jira_config = JIRA_PKey.objects.filter(product=pid).first()
     elif eid and pid_local:
         show_product_column = False
         product_tab = Product_Tab(pid_local, title=eng.name, tab="engagements")
-        jira_config = JIRA_PKey.objects.filter(product__engagement=eid)[0].conf_id
+        jira_config = JIRA_PKey.objects.filter(product__engagement=eid).first()
     else:
         add_breadcrumb(title="Findings", top_level=not len(request.GET), request=request)
     # raise Exception('Stop')
diff --git a/dojo/test/views.py b/dojo/test/views.py
@@ -70,7 +70,7 @@ def view_test(request, tid):
 
     product_tab = Product_Tab(prod.id, title="Test", tab="engagements")
     product_tab.setEngagement(test.engagement)
-    jira_config = JIRA_PKey.objects.filter(product=prod.id)[0].conf_id
+    jira_config = JIRA_PKey.objects.filter(product=prod.id).first()
     return render(request, 'dojo/view_test.html',
                   {'test': test,
                    'product_tab': product_tab,
