From 609522432cdb69b78dcd308946a17af34ac7db62 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Mon, 16 Sep 2019 16:05:55 +0200
Subject: [PATCH] Display only needed arrows on rebus (issue #253)
---
schoolapps/support/templates/support/mail/rebus.html | 2 +-
schoolapps/support/views.py | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/schoolapps/support/templates/support/mail/rebus.html b/schoolapps/support/templates/support/mail/rebus.html
index f1e8e338e..9a81df7ff 100755
--- a/schoolapps/support/templates/support/mail/rebus.html
+++ b/schoolapps/support/templates/support/mail/rebus.html
@@ -2,7 +2,7 @@
<main>
<blockquote>
- <p>{{ a }} → {{ b }} → {{ c }}</p>
+ <p>{{ arrow_list }}</p>
<p>{{ short_desc }}</p>
<p>{{ long_desc }}</p>
<p>Ãœbermittelt von {{ user.get_full_name }} ({{ user.username }})</p>
diff --git a/schoolapps/support/views.py b/schoolapps/support/views.py
index 580ad5349..a668c01a1 100644
--- a/schoolapps/support/views.py
+++ b/schoolapps/support/views.py
@@ -8,6 +8,10 @@ from .forms import FeedbackForm
from dashboard.models import Activity
+def add_arrows(array: list):
+ return " → ".join([item for item in array if item])
+
+
def rebus(request):
if request.method == 'POST':
form = REBUSForm(request.POST)
@@ -20,16 +24,14 @@ def rebus(request):
long_description = form.cleaned_data['long_description']
# Register activity
- desc_act = "{} → {} → {} | {}".format(a, b, c, short_description)
+ desc_act = "{} | {}".format(add_arrows([a, b, c]), short_description)
act = Activity(title="Du hast uns ein Problem gemeldet.", description=desc_act, app="REBUS",
user=request.user)
act.save()
# Send mail
context = {
- "a": a,
- "b": b,
- "c": c,
+ "arrow_list": add_arrows([a, b, c]),
"short_desc": short_description,
"long_desc": long_description,
"user": request.user
--
GitLab