Merge branch 'main' into fix-boefje-env-vars

minvws · Nov 11, 2024 · 2373c32 · 2373c32
2 parents 38e42d5 + bf3267a
commit 2373c32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/rocky/reports/report_types/aggregate_organisation_report/system_specific.html b/rocky/reports/report_types/aggregate_organisation_report/system_specific.html
@@ -57,7 +57,13 @@ <h5>{% translate "Host:" %} {{ ip.human_readable }}</h5>
             <tbody>
                 {% for finding_type in findings %}
                     <tr>
-                        <td>{{ finding_type.description }}</td>
+                        <td>
+                            {% if finding_type.description %}
+                                {{ finding_type.description }}
+                            {% else %}
+                                {{ finding_type.id }}
+                            {% endif %}
+                        </td>
                         <td>
                             <span class="{{ finding_type.risk_severity }}">{{ finding_type.risk_severity|capfirst }}</span>
                         </td>

diff --git a/rocky/reports/report_types/safe_connections_report/report.html b/rocky/reports/report_types/safe_connections_report/report.html
@@ -64,7 +64,13 @@ <h5>{% translate "Host:" %} {{ ip }}</h5>
                 <tbody>
                     {% for finding_type in findings %}
                         <tr>
-                            <td>{{ finding_type.description }}</td>
+                            <td>
+                                {% if finding_type.description %}
+                                    {{ finding_type.description }}
+                                {% else %}
+                                    {{ finding_type.id }}
+                                {% endif %}
+                            </td>
                             <td>
                                 <span class="{{ finding_type.risk_severity }}">{{ finding_type.risk_severity|capfirst }}</span>
                             </td>