Merge pull request #5723 from DefectDojo/release/2.6.2

Release: Merge release into master from: release/2.6.2

Author: Maffooch

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defectdojo",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license" : "BSD-3-Clause",
   "private": true,
   "dependencies": {

dojo/__init__.py

@@ -6,6 +6,6 @@
 
 default_app_config = 'dojo.apps.DojoAppConfig'
 
-__version__ = '2.6.1'
+__version__ = '2.6.2'
 __url__ = 'https://github.com/DefectDojo/django-DefectDojo'
 __docs__ = 'https://defectdojo.github.io/django-DefectDojo'

dojo/importers/importer/importer.py

@@ -104,7 +104,7 @@ def process_parsed_findings(self, test, parsed_findings, scan_type, user, active
 
             # if scan_date was provided, override value from parser
             if scan_date:
-                item.date = scan_date
+                item.date = scan_date.date()
 
             item.service = service
 

dojo/importers/reimporter/reimporter.py

@@ -142,7 +142,7 @@ def process_parsed_findings(self, test, parsed_findings, scan_type, user, active
 
                 # if scan_date was provided, override value from parser
                 if scan_date:
-                    item.date = scan_date
+                    item.date = scan_date.date()
 
                 # Save it. Don't dedupe before endpoints are added.
                 item.save(dedupe_option=False)