From a77320b27db34900897d0585891286dbcb7f850f Mon Sep 17 00:00:00 2001 From: Daniel Ramsay Date: Fri, 2 Apr 2021 13:56:17 +0100 Subject: [PATCH] use report mailname instead of reporter email openrightsgroup/Blocking-Middleware#133 --- BlockedFrontend/default_settings.py | 2 ++ BlockedFrontend/templates/admin/ispreports_escalate.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BlockedFrontend/default_settings.py b/BlockedFrontend/default_settings.py index a2c230e..42ae660 100644 --- a/BlockedFrontend/default_settings.py +++ b/BlockedFrontend/default_settings.py @@ -86,3 +86,5 @@ RANDOMSITE = 'frontpagelists' DEFAULT_REGION = 'gb' + +MAIL_DOMAIN = 'example.com' diff --git a/BlockedFrontend/templates/admin/ispreports_escalate.html b/BlockedFrontend/templates/admin/ispreports_escalate.html index cea7ae3..0c1d07f 100644 --- a/BlockedFrontend/templates/admin/ispreports_escalate.html +++ b/BlockedFrontend/templates/admin/ispreports_escalate.html @@ -25,7 +25,7 @@

Original complaint

Additional contact information

- {{ forms.textarea_field('Submitted by', 'additional_contact', "Request originally submitted by " + report.name + " (" + report.email + ")" ) }} + {{ forms.textarea_field('Submitted by', 'additional_contact', "Request originally submitted by " + report.name + " (" + report.mailname + '@' +config.MAIL_DOMAIN + ")" ) }}

Mobile network response

{% if emailreply %}