From 7087be672a4b72921424e9dc3aff4c339392a67c Mon Sep 17 00:00:00 2001
From: "Adrian A. Baumann" <ade@adebaumann.com>
Date: Thu, 23 Oct 2025 09:35:23 +0200
Subject: [PATCH] Added "Geltungsbereich" back into search function and
 corrected it; Changed "standards" page to "dokumente" internally

---
 dokumente/templates/standards/standard_list.html | 6 +++---
 dokumente/views.py                               | 4 ++--
 pages/templates/base.html                        | 2 +-
 pages/views.py                                   | 7 ++++++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/dokumente/templates/standards/standard_list.html b/dokumente/templates/standards/standard_list.html
index c6c6cfc..1fb5072 100644
--- a/dokumente/templates/standards/standard_list.html
+++ b/dokumente/templates/standards/standard_list.html
@@ -2,10 +2,10 @@
 {% block content %}
 <h1>Standards Informatiksicherheit</h1>
 <ul>
-  {% for standard in standards %}
+  {% for dokument in dokumente %}
     <li>
-      <a href="{% url 'standard_detail' nummer=standard.nummer %}">
-        {{ standard.nummer }} – {{ standard.name }}
+      <a href="{% url 'standard_detail' nummer=dokument.nummer %}">
+        {{ dokument.nummer }} – {{ dokument.name }}
       </a>
     </li>
   {% endfor %}
diff --git a/dokumente/views.py b/dokumente/views.py
index 604aa1f..7e844c7 100644
--- a/dokumente/views.py
+++ b/dokumente/views.py
@@ -9,9 +9,9 @@ calendar=parsedatetime.Calendar()
 
 
 def standard_list(request):
-    standards = Dokument.objects.all()
+    dokumente = Dokument.objects.all()
     return render(request, 'standards/standard_list.html',
-                  {'dokumente': standards}
+                  {'dokumente': dokumente}
                   )
 
 
diff --git a/pages/templates/base.html b/pages/templates/base.html
index c0d3773..d8869ca 100644
--- a/pages/templates/base.html
+++ b/pages/templates/base.html
@@ -28,6 +28,6 @@
     <div class="flex-fill">{% block content %}Main Content{% endblock %}</div>
     <div class="col-md-2">{% block sidebar_right %}{% endblock %}</div>
 </div>
-<div>VorgabenUI v0.930</div>
+<div>VorgabenUI v0.931</div>
 </body>
 </html>
diff --git a/pages/views.py b/pages/views.py
index 6156ba5..d2f4854 100644
--- a/pages/views.py
+++ b/pages/views.py
@@ -3,6 +3,7 @@ from abschnitte.utils import render_textabschnitte
 from dokumente.models import Dokument, VorgabeLangtext, VorgabeKurztext, Geltungsbereich
 from itertools import groupby
 import datetime
+import pprint
 
 def startseite(request):
     standards=list(Dokument.objects.all())
@@ -21,6 +22,10 @@ def search(request):
         for r in result.keys():
             for s in result[r].keys():
                 result["all"][s] = set(result[r][s])
-        print (result)
+        result["geltungsbereich"]={}
+        geltungsbereich=set(list([x.geltungsbereich for x in Geltungsbereich.objects.filter(inhalt__contains=suchbegriff)]))
+        for s in geltungsbereich:
+            result["geltungsbereich"][s]=render_textabschnitte(s.geltungsbereich_set.order_by("order"))
+        pprint.pp (result)
         return render(request,"results.html",{"suchbegriff":suchbegriff,"resultat":result})