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

Author: root

README.md

@@ -31,7 +31,7 @@ Deploy to Docker Cloud. (<b>Login first to Docker Cloud before clicking the inst
 
 # Installation Options
 
-### [Debian or RHEL-based Install Script](http://defectdojo.readthedocs.io/en/latest/getting-started.html#install-script)
+### [Debian, Ubuntu (16.04.2+) or RHEL-based Install Script](http://defectdojo.readthedocs.io/en/latest/getting-started.html#install-script)
 
 ### [Docker](http://defectdojo.readthedocs.io/en/latest/getting-started.html#docker-local-install) - There are currently a number of bugs in the Docker image that we're working to address. Please use the regular install script to avoid issues.
 

dojo/reports/widgets.py

@@ -287,7 +287,7 @@ def __init__(self, *args, **kwargs):
 
     def get_asciidoc(self):
         asciidoc = render_to_string("dojo/custom_asciidoc_report_findings.html",
-                                    {"findings": self.findings,
+                                    {"findings": self.findings.qs,
                                      "host": self.host,
                                      "include_finding_notes": self.finding_notes,
                                      "include_finding_images": self.finding_images,
@@ -297,7 +297,7 @@ def get_asciidoc(self):
     def get_html(self):
         html = render_to_string("dojo/custom_pdf_report_finding_list.html",
                                 {"title": self.title,
-                                 "findings": self.findings,
+                                 "findings": self.findings.qs,
                                  "include_finding_notes": self.finding_notes,
                                  "include_finding_images": self.finding_images,
                                  "host": self.host,
@@ -357,7 +357,7 @@ def __init__(self, *args, **kwargs):
     def get_html(self):
         html = render_to_string("dojo/custom_pdf_report_endpoint_list.html",
                                 {"title": self.title,
-                                 "endpoints": self.endpoints,
+                                 "endpoints": self.endpoints.qs,
                                  "include_finding_notes": self.finding_notes,
                                  "include_finding_images": self.finding_images,
                                  "host": self.host,
@@ -366,7 +366,7 @@ def get_html(self):
 
     def get_asciidoc(self):
         asciidoc = render_to_string("dojo/custom_asciidoc_report_endpoints.html",
-                                    {"endpoints": self.endpoints,
+                                    {"endpoints": self.endpoints.qs,
                                      "host": self.host,
                                      "include_finding_notes": self.finding_notes,
                                      "include_finding_images": self.finding_images,

dojo/static/dojo/css/dojo.css

@@ -1108,7 +1108,7 @@ hr.report-page-break:before {
 
 .editor {
     overflow: scroll;
-    max-height: 250px
+    min-height: 250px;
 }
 
 .in-use-widgets .report-filter-set .btn-sm {

dojo/tasks.py

@@ -124,11 +124,9 @@ def async_custom_pdf_report(self,
             toc_settings = selected_widgets['table-of-contents']
 
             toc_depth = toc_settings.depth
-
             toc_bytes = render_to_string(xsl_style_sheet_tempalte, {'widgets': widgets,
                                                                     'depth': toc_depth,
                                                                     'title': toc_settings.title})
-
             temp.write(toc_bytes)
             temp.seek(0)
 
@@ -143,12 +141,10 @@ def async_custom_pdf_report(self,
                            'info': cp.meta_info})
             cover = host + reverse(
                 'report_cover_page') + "?" + x
-
         bytes = render_to_string(template, {'widgets': widgets,
                                             'toc_depth': toc_depth,
                                             'host': host,
                                             'report_name': report.name})
-
         pdf = pdfkit.from_string(bytes,
                                  False,
                                  configuration=config,

dojo/templates/dojo/custom_pdf_report.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="pdfkit-page-size" content="Letter"/>
     <meta name="pdfkit-orientation" content="Portrait"/>
+    <meta name="pdfkit-dpi" content="400"/>
     <meta name="pdfkit-viewport-size" content="1440x1024"/>
     <meta name="pdfkit-header-left" content="Custom PDF Report"/>
     <meta name="pdfkit-header-right" content="[page]/[toPage]"/>

dojo/templates/dojo/custom_pdf_report_finding_list.html

@@ -69,7 +69,7 @@ <h5>
                                     </a>
                                 </td>
                             {% endif %}
-                            <td>{{{ finding.id }}</td>
+                            <td>{{ finding.id }}</td>
                         </tr>
                     </table>
                 </div>

dojo/templates/report_base.html

@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="pdfkit-page-size" content="Letter"/>
     <meta name="pdfkit-orientation" content="Portrait"/>
+    <meta name="pdfkit-dpi" content="400"/>
     <meta name="pdfkit-viewport-size" content="1440x1024"/>
     <meta name="pdfkit-header-left" content="{{ report_name }}"/>
     <meta name="pdfkit-header-right" content="[page]/[toPage]"/>

dojo/test/views.py

@@ -114,7 +114,7 @@ def delete_test(request, tid):
     eng = test.engagement
     form = DeleteTestForm(instance=test)
 
-    from django.contrib.admin.util import NestedObjects
+    from django.contrib.admin.utils import NestedObjects
     from django.db import DEFAULT_DB_ALIAS
 
     collector = NestedObjects(using=DEFAULT_DB_ALIAS)