From b0b5d073d3a71b9c6baec41fd453890c42e308cb Mon Sep 17 00:00:00 2001
From: Alexander Kaschta <alexander.kaschta9@kit.edu>
Date: Mon, 17 Mar 2025 16:53:42 +0100
Subject: [PATCH] FIX: Jinja2 template none value handling
---
templates/bcd_request_template.j2 | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/templates/bcd_request_template.j2 b/templates/bcd_request_template.j2
index 1aace94..4aac507 100644
--- a/templates/bcd_request_template.j2
+++ b/templates/bcd_request_template.j2
@@ -23,7 +23,7 @@
<th style="border: 1px solid black; border-collapse: collapse;">Protection Requirements</th>
<td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.protection_requirement }}</td>
</tr>
- {% if bcd_request.protection_requirement_note is not None %}
+ {% if bcd_request.protection_requirement_note is not none %}
<tr>
<th style="border: 1px solid black; border-collapse: collapse;">Special Protection Requirements Note</th>
<td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.protection_requirement_note }}</td>
@@ -33,12 +33,38 @@
<th style="border: 1px solid black; border-collapse: collapse;">Type of Systems</th>
<td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.type_of_system }}</td>
</tr>
- {% if bcd_request.type_of_system_note is not None%}
+ {% if bcd_request.type_of_system_note is not none %}
<tr>
<th style="border: 1px solid black; border-collapse: collapse;">Special Type of Systems Note</th>
<td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.type_of_system_note }}</td>
</tr>
{% endif %}
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">Loadbalancer</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.load_balancer }}</td>
+ </tr>
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">BCD Name</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.bcd_name }}</td>
+ </tr>
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">Access to The Internet</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.access_to_internet }}</td>
+ </tr>
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">Access From The Internet</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.access_from_internet }}</td>
+ </tr>
+ {% if bcd_request.access_from_internet and bcd_request.type_of_system != 2 %}
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">Access From The Internet Note</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.access_from_internet_explanation }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <th style="border: 1px solid black; border-collapse: collapse;">Type of Subnet</th>
+ <td style="border: 1px solid black; border-collapse: collapse;">{{ bcd_request.type_of_subnet }}</td>
+ </tr>
</table>
<p>Have a nice day!</p>
--
GitLab