Merge branch 'main' into 1.10-release-notes

requirements.txt

@@ -1,4 +1,4 @@
 sphinx==6.1.3
 sphinx_rtd_theme==1.2.2
 sphinxcontrib-mermaid==0.8.1
-myst-parser==1.0.0
+myst-parser==2.0.0

rocky/katalogus/views/katalogus.py

@@ -73,7 +73,7 @@ def sort_queryset(self, queryset, sort_options):
         if sort_options == "a-z":
             return queryset
         if sort_options == "z-a":
-            return reversed(queryset)
+            return queryset[::-1]
         if sort_options == "enabled-disabled":
             return sorted(queryset, key=lambda item: not item["enabled"])
         if sort_options == "disabled-enabled":

rocky/rocky/settings.py

@@ -85,7 +85,17 @@
 EMAIL_BACKEND = env("EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend")
 EMAIL_FILE_PATH = env.path("EMAIL_FILE_PATH", BASE_DIR / "rocky/email_logs")  # directory to store output files
 EMAIL_HOST = env("EMAIL_HOST", default="localhost")  # localhost
-EMAIL_PORT = env.int("EMAIL_PORT", default=25)  # 25
+try:
+    EMAIL_PORT = env.int("EMAIL_PORT", default=25)
+except ValueError:
+    # We have an empty EMAIL_PORT= to rocky.conf in the Debian package. We
+    # handle the empty string as default value here so we don't generate an
+    # exception for this
+    if env("EMAIL_PORT"):
+        raise
+
+    EMAIL_PORT = 25
+
 EMAIL_HOST_USER = env("EMAIL_HOST_USER", default="")
 EMAIL_HOST_PASSWORD = env("EMAIL_HOST_PASSWORD", default="")
 DEFAULT_FROM_EMAIL = env("DEFAULT_FROM_EMAIL", default="")

rocky/rocky/templates/oois/ooi_detail_findings_list.html

@@ -29,7 +29,7 @@ <h2>{% translate "Findings" %}</h2>
                         <td>{{ finding_type.risk_score }}</td>
                         <td>{{ finding.description }}</td>
                         <td>
-                            <a href="{% ooi_url 'ooi_detail' finding.id organization.code query=mandatory_fields %}">{{ finding.human_readable }}</a>
+                            <a href="{% ooi_url 'ooi_detail' finding.primary_key organization.code query=mandatory_fields %}">{{ finding.human_readable }}</a>
                         </td>
                     </tr>
                 {% endfor %}