From f194ef5f234337b56fe3a2d8ccef1b553f906042 Mon Sep 17 00:00:00 2001 From: Benni Baermann Date: Tue, 2 Mar 2021 13:41:59 +0100 Subject: [PATCH] added special to OfficeForm, removed autoescape from email-template --- evapp/forms.py | 2 +- evapp/models.py | 2 +- evapp/templates/evapp/dataloop.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/evapp/forms.py b/evapp/forms.py index c63b58e..2e277db 100644 --- a/evapp/forms.py +++ b/evapp/forms.py @@ -56,7 +56,7 @@ class ITForm(EvaForm): class OfficeForm(EvaForm): class Meta: model = Employee - fields = ['transponder', 'post_office_box',] + fields = ['transponder', 'special', 'post_office_box',] class ChangeForm(EvaForm): class Meta: diff --git a/evapp/models.py b/evapp/models.py index 3a19031..04a6f97 100644 --- a/evapp/models.py +++ b/evapp/models.py @@ -11,7 +11,7 @@ DEPARTMENT_CHOICES = {'PROG': 'Programme', 'CENT': 'Central', 'VOR': 'Vorstand',} -LAPTOP_CHOICES = {'14': '14", uUser Standardgerät', +LAPTOP_CHOICES = {'14': '14", Unser Standardgerät', '12': '12,5", Geeignet für Vielreisende',} VENDOR_CHOICES = {'STANDARD': 'Dell Latitude', diff --git a/evapp/templates/evapp/dataloop.txt b/evapp/templates/evapp/dataloop.txt index a47b40e..c1593b3 100644 --- a/evapp/templates/evapp/dataloop.txt +++ b/evapp/templates/evapp/dataloop.txt @@ -1,3 +1,5 @@ +{% autoescape off %} {% for key, value in data.items %} {{ key }}: {{ value }} {% endfor %} +{% endautoescape %}