Merge branch 'master' of github.com:rackerlabs/django-DefectDojo

Author: cneill

dojo/filters.py

@@ -310,6 +310,9 @@ class ClosedFindingFilter(FilterSet):
     test__engagement__product = ModelMultipleChoiceFilter(
         queryset=Product.objects.all(),
         label="Product")
+    test__engagement__product__prod_type = ModelMultipleChoiceFilter(
+        queryset=Product_Type.objects.all(),
+        label="Product Type")
 
     class Meta:
         model = Finding
@@ -358,6 +361,9 @@ class AcceptedFindingFilter(FilterSet):
     test__engagement__product = ModelMultipleChoiceFilter(
         queryset=Product.objects.all(),
         label="Product")
+    test__engagement__product__prod_type = ModelMultipleChoiceFilter(
+        queryset=Product_Type.objects.all(),
+        label="Product Type")
 
     class Meta:
         model = Finding

dojo/templates/dojo/accepted_findings.html

@@ -11,6 +11,7 @@
                             <th>Name</th>
                             <th>Date</th>
                             <th>Accepted On</th>
+                            <th>Age</th>
                             <th>Severity</th>
                             <th>Product</th>
                         </tr>
@@ -23,6 +24,7 @@
                                 </td>
                                 <td class="nowrap">{{ finding.date }}</td>
                                 <td class="">{{ finding.risk_acceptance_set.all.0.created.date }}</td>
+                                <td>{{ finding.age }}</td>
                                 <td>{% if finding.severity == "Critical" or finding.severity == "High" %}
                                     <p class="text-error">
                                 {% else %}<p>{% endif %}{{ finding.severity }}</p></td>

dojo/templates/dojo/closed_findings.html

@@ -11,6 +11,7 @@
                             <th>Name</th>
                             <th>Date</th>
                             <th>Mitigated On</th>
+                            <th>Age</th>
                             <th>Severity</th>
                             <th>Product</th>
                         </tr>
@@ -23,6 +24,7 @@
                                 </td>
                                 <td class="nowrap">{{ finding.date }}</td>
                                 <td class="">{{ finding.mitigated.date }}</td>
+                                <td>{{ finding.age }}</td>
                                 <td>{% if finding.severity == "Critical" or finding.severity == "High" %}
                                     <p class="text-error">
                                 {% else %}<p>{% endif %}{{ finding.severity }}</p></td>