Merge pull request DefectDojo#205 from aaronweaver/master

Aaron Weaver · web-flow · commit 5439f4ea16dc · 2017-01-26T15:16:50.000-05:00
Added Mitigation to Jira push and Jira links to engagement view.
diff --git a/dojo/models.py b/dojo/models.py
@@ -659,6 +659,7 @@ def long_desc(self):
         for e in self.endpoints.all():
             long_desc += str(e) + '\n\n'
         long_desc += '*Description*: \n' + self.description + '\n\n'
+        long_desc += '*Mitigation*: \n' + self.mitigation + '\n\n'
         long_desc += '*Impact*: \n' + self.impact + '\n\n'
         long_desc += '*References*:' + self.references
         return long_desc
diff --git a/dojo/templates/dojo/view_eng.html b/dojo/templates/dojo/view_eng.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load display_tags %}
+{% load get_config_setting %}
 {% block content %}
     <!-- start status bread crums -->
     <ul id="progress-crumbs" class="breadcrumb">
@@ -406,6 +407,9 @@ <h4> Findings</h4>
                     <th>Mitigation Date</th>
                     <th>Verified</th>
                     <th>Active</th>
+                    <{% if "ENABLE_JIRA"|get_config_setting %}
+                    <th>Jira</th>
+                    {% endif %}
                     <th>Actions</th>
                 </tr>
                 </thead>
@@ -420,6 +424,11 @@ <h4> Findings</h4>
                         <td>{{ finding.mitigated }}</td>
                         <td>{{ finding.verified }}</td>
                         <td>{{ finding.active }}</td>
+                        {% if "ENABLE_JIRA"|get_config_setting %}
+                        <td>
+                        <a href="{{finding.jira_conf.url}}/browse/{{finding.jira.jira_key}}" target="_blank"> {{finding.jira.jira_key}} </a>
+                        </td>
+                        {% endif %}
                         <td>
                             <div class="btn-group">
                                 <a class="btn btn-sm btn-primary"
