From 7859fd2847389866d542b0e97bcab24881789950 Mon Sep 17 00:00:00 2001 From: "Adrian A. Baumann" Date: Tue, 23 Sep 2025 13:26:07 +0200 Subject: [PATCH] Various changes for test-deployment --- .gitignore | 2 ++ VorgabenUI/settings.py | 1 + abschnitte/utils.py | 2 +- diagramm_proxy/views.py | 2 +- standards/templates/standards/standard_detail.html | 4 +--- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b404c9d..301d80e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ bin/ pyvenv.cfg include/ keys/ + +*.kate-swp diff --git a/VorgabenUI/settings.py b/VorgabenUI/settings.py index 5106155..2866e17 100644 --- a/VorgabenUI/settings.py +++ b/VorgabenUI/settings.py @@ -87,6 +87,7 @@ TEMPLATES = [ WSGI_APPLICATION = 'VorgabenUI.wsgi.application' +CSRF_TRUSTED_ORIGINS=["https://vorgabenportal.knowyoursecurity.com"] # Database # https://docs.djangoproject.com/en/5.2/ref/settings/#databases diff --git a/abschnitte/utils.py b/abschnitte/utils.py index d0b9481..6194727 100644 --- a/abschnitte/utils.py +++ b/abschnitte/utils.py @@ -4,7 +4,7 @@ import zlib import re from textwrap import dedent -DIAGRAMMSERVER="http://10.128.128.144:8000/diagramm" +DIAGRAMMSERVER="/diagramm" def render_textabschnitte(queryset): """ diff --git a/diagramm_proxy/views.py b/diagramm_proxy/views.py index 539e613..19222f0 100644 --- a/diagramm_proxy/views.py +++ b/diagramm_proxy/views.py @@ -1,4 +1,4 @@ from revproxy.views import ProxyView class DiagrammProxyView(ProxyView): - upstream = "http://localhost:8001/" + upstream = "http://kroki:8000/" diff --git a/standards/templates/standards/standard_detail.html b/standards/templates/standards/standard_detail.html index a3fbf9a..6a43def 100644 --- a/standards/templates/standards/standard_detail.html +++ b/standards/templates/standards/standard_detail.html @@ -38,9 +38,7 @@ {% if vorgabe.relevanzset %} Relevanz: - {% for V in vorgabe.relevanzset %} - {{ V|make_list|first }} - {% endfor %} + {{ vorgabe.relevanzset|join:", " }} {% endif %}