Merge remote-tracking branch 'upstream/dev' into dev

DefectDojo · Nov 2, 2021 · 9ca2472 · 9ca2472
2 parents a3fdf23 + cdc81b9
commit 9ca2472
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dojo/db_migrations/0131_migrate_sonarcube_cobalt.py b/dojo/db_migrations/0131_migrate_sonarcube_cobalt.py
@@ -6,7 +6,7 @@
 
 
 def migrate_sonarqube(apps, schema_editor):
-    sq_products = Sonarqube_Product.objects.all()
+    sq_products = Sonarqube_Product.objects.filter(sonarqube_tool_config__isnull=False)
     for sq_product in sq_products:
         api_scan_configuration = Product_API_Scan_Configuration()
         api_scan_configuration.product = sq_product.product
@@ -22,7 +22,7 @@ def migrate_sonarqube(apps, schema_editor):
 
 
 def migrate_cobalt_io(apps, schema_editor):
-    cobalt_products = Cobaltio_Product.objects.all()
+    cobalt_products = Cobaltio_Product.objects.filter(cobaltio_tool_config__isnull=False)
     for cobalt_product in cobalt_products:
         api_scan_configuration = Product_API_Scan_Configuration()
         api_scan_configuration.product = cobalt_product.product

diff --git a/dojo/templates/dojo/dashboard.html b/dojo/templates/dojo/dashboard.html
@@ -46,7 +46,7 @@
                         </div>
                     </div>
                 </div>
-                <a href="{% url 'all_findings' %}?duplicate=2&date=2">
+                <a href="{% url 'all_findings' %}?duplicate=2&date=2&o=-date">
                     <div class="panel-footer">
                         <span class="pull-left">View Finding Details</span>
                         <span class="pull-right"><i class="fa fa-arrow-circle-right"></i></span>