diff --git a/CHANGELOG.md b/CHANGELOG.md index 8044b31..dddb08e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,16 @@ Changelog ========= +## Version 1.1 + +### Enhancements and Bugfixes: +* [#51](https://github.com/1modm/petereport/issues/51) Error when importing from DefectDojo +* Minor changes + ## Version 1.0 ### Enhancements and Bugfixes: -* [#48](https://github.com/1modm/petereport/issues/48)'bleach' causing Internal Error 500 +* [#48](https://github.com/1modm/petereport/issues/48) 'bleach' causing Internal Error 500 * Upgraded bleach and django-bleach versions ## Version 0.9 diff --git a/app/preport/templates/findings/defectdojo_products.html b/app/preport/templates/findings/defectdojo_products.html index c88cd73..87b92ca 100644 --- a/app/preport/templates/findings/defectdojo_products.html +++ b/app/preport/templates/findings/defectdojo_products.html @@ -1,5 +1,8 @@ {% extends 'home/template.html' %} +{% load martortags %} +{% load bleach_tags %} + {% block title %} DefectDojo Import {% endblock title %} {% block stylesheets %} @@ -59,7 +62,7 @@

{{DDproducts_count}} DefectDojo Products

{% for product in DDproducts %} - {{ product.id | bleach }} + {{ product.id }} {{ product.name | bleach }} diff --git a/app/preport/templates/home/footer.html b/app/preport/templates/home/footer.html index a5ac7ec..e98d089 100644 --- a/app/preport/templates/home/footer.html +++ b/app/preport/templates/home/footer.html @@ -1,6 +1,6 @@ diff --git a/app/preport/templates/home/index.html b/app/preport/templates/home/index.html index 7cc956e..6e7aef6 100644 --- a/app/preport/templates/home/index.html +++ b/app/preport/templates/home/index.html @@ -136,23 +136,23 @@

{{ finding.report.title }} {% if finding.cvss_score >= 9 %} - {{finding.title}} + {{finding.title}} {{finding.cwe.cwe_id}} Critical {{ finding.cvss_score }} {% elif finding.cvss_score >= 7 %} - {{finding.title}} + {{finding.title}} {{finding.cwe.cwe_id}} High {{ finding.cvss_score }} {% elif finding.cvss_score >= 4 %} - {{finding.title}} + {{finding.title}} {{finding.cwe.cwe_id}} Medium {{ finding.cvss_score }} {% elif finding.cvss_score >= 0.1 %} - {{finding.title}} + {{finding.title}} {{finding.cwe.cwe_id}} Low {{ finding.cvss_score }} {% else %} - {{finding.title}} + {{finding.title}} {{finding.cwe.cwe_id}} Info {{ finding.cvss_score }} {% endif %} diff --git a/app/preport/templates/reports/report_view.html b/app/preport/templates/reports/report_view.html index d5e1cfa..e7058df 100644 --- a/app/preport/templates/reports/report_view.html +++ b/app/preport/templates/reports/report_view.html @@ -35,7 +35,7 @@

{{ DB_report_query.title }} Report

- +