Merge pull request #246 from Katharineum/feature/make-support-otrs-ready

Change email texts of support app to make them OTRS ready (issue #234)

schoolapps/mailer.py

@@ -4,7 +4,7 @@ from django.template.loader import render_to_string
 SENDER_EMAIL = 'SchoolApps <infoplan@katharineum.de>'
 
 
-def send_mail_with_template(title, receivers, plain_template, html_template, context={}):
+def send_mail_with_template(title, receivers, plain_template, html_template, context={}, sender_email=SENDER_EMAIL):
     msg_plain = render_to_string(plain_template, context)
     msg_html = render_to_string(html_template, context)
 
@@ -12,7 +12,7 @@ def send_mail_with_template(title, receivers, plain_template, html_template, con
         send_mail(
             title,
             msg_plain,
-            SENDER_EMAIL,
+            sender_email,
             receivers,
             html_message=msg_html,
         )

schoolapps/support/templates/support/mail/feedback.html

 {% include "mail/header.html" %}
 
 <main>
-    <p>Hallo SchoolApps-Team,</p>
-    <p>es gibt neues Feedback:</p>
     <blockquote>
         Bewertungen: {{ design }}/5 (Design), {{ performance }}/5 (Geschwindigkeit), {{ usability }}/5
         (Benutzerfreundlichkeit)
@@ -15,7 +13,8 @@
 
         Sonstiges: {{ more }}
 
-        <p>Übermittelt von {{ user }}</p>
+        <p>Übermittelt von {{ user.get_full_name }} ({{ user.username }})</p>
     </blockquote>
 
+    <em>Dieses Feedback wurde über SchoolApps übermittelt.</em>
 </main>
\ No newline at end of file

schoolapps/support/templates/support/mail/feedback.txt

-Hallo SchoolApps-Team,
-
-es gibt neues Feedback:
-
-
 Bewertungen: {{ design }}/5 (Design), {{ performance }}/5 (Geschwindigkeit), {{ usability }}/5 (Benutzerfreundlichkeit)
 
 Bewertung (insgesamt): {{ overall }}/5
@@ -13,5 +8,7 @@ Ideen/Wünsche: {{ ideas }}
 
 Sonstiges: {{ more }}
 
-Übermittelt von {{ user }}
+Übermittelt von {{ user.get_full_name }} ({{ user.username }})
+
 
+Dieses Feedback wurde über SchoolApps übermittelt.
\ No newline at end of file

schoolapps/support/templates/support/mail/rebus.html

 {% include "mail/header.html" %}
 
 <main>
-    <p>Hallo,</p>
-    <p>es gibt eine neue REBUS-Meldung:</p>
     <blockquote>
         <p>{{ a }} → {{ b }} → {{ c }}</p>
         <p>{{ short_desc }}</p>
         <p>{{ long_desc }}</p>
-        <p>Übermittelt von {{ user }}</p>
+        <p>Übermittelt von {{ user.get_full_name }} ({{ user.username }})</p>
     </blockquote>
 
-    <i>Dein SchoolApps-Team</i>
+    <em>Der Fehlerbericht wurde über REBUS in SchoolApps übermittelt.</em>
 </main>
\ No newline at end of file

schoolapps/support/templates/support/mail/rebus.txt

-Hallo,
-
-es gibt eine neue REBUS-Meldung:
-
-
 {{ a }} → {{ b }} → {{ c }}
 
 {{ short_desc }}
 
 {{ long_desc }}
 
-Übermittelt von {{ user }}
+Übermittelt von {{ user.get_full_name }} ({{ user.username }})
 
 
-Dein SchoolApps-Team
+Der Fehlerbericht wurde über REBUS in SchoolApps übermittelt.
\ No newline at end of file

schoolapps/support/views.py

@@ -32,10 +32,12 @@ def rebus(request):
                 "c": c,
                 "short_desc": short_description,
                 "long_desc": long_description,
-                "user": request.user.username
+                "user": request.user
             }
-            send_mail_with_template("Neue REBUS-Meldung", [mail_settings.mail_rebus], "support/mail/rebus.txt",
-                                    "support/mail/rebus.html", context)
+            send_mail_with_template("[REBUS] {}".format(short_description), [mail_settings.mail_rebus],
+                                    "support/mail/rebus.txt",
+                                    "support/mail/rebus.html", context,
+                                    "{} <{}>".format(request.user.get_full_name(), request.user.email))
 
             return render(request, 'support/rebus_submitted.html')
     else:
@@ -75,12 +77,13 @@ def feedback(request):
                 "more": more,
                 "apps": apps,
                 "ideas": ideas,
-                "user": request.user.username
+                "user": request.user
             }
-            send_mail_with_template("Neues Feedback von {}".format(request.user.username),
+            send_mail_with_template("Feedback von {}".format(request.user.username),
                                     [mail_settings.mail_feedback],
                                     "support/mail/feedback.txt",
-                                    "support/mail/feedback.html", context)
+                                    "support/mail/feedback.html", context,
+                                    "{} <{}>".format(request.user.get_full_name(), request.user.email))
 
             return render(request, 'support/feedback_submitted.html')
     else: