# 63 Mail shared access revoked
* adds mail support for revoking shared access * adds/updates translations
This commit is contained in:
@@ -204,9 +204,15 @@ DEBUG_TOOLBAR_CONFIG = {
|
||||
}
|
||||
|
||||
# EMAIL (see https://docs.djangoproject.com/en/dev/topics/email/)
|
||||
DEFAULT_FROM_EMAIL = "bot@arneo.de" # The default email address for the 'from' element
|
||||
|
||||
# CHANGE_ME !!! ONLY FOR DEVELOPMENT !!!
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
|
||||
EMAIL_FILE_PATH = '/tmp/app-messages' # change this to a proper location
|
||||
|
||||
DEFAULT_FROM_EMAIL = "service@ksp.de" # The default email address for the 'from' element
|
||||
EMAIL_HOST = "localhost"
|
||||
EMAIL_PORT = "1025"
|
||||
EMAIL_REPLY_TO = "ksp-servicestelle@sgdnord.rlp.de"
|
||||
EMAIL_PORT = "25"
|
||||
#EMAIL_HOST_USER = ""
|
||||
#EMAIL_HOST_PASSWORD = ""
|
||||
EMAIL_USE_TLS = False
|
||||
|
||||
@@ -11,7 +11,7 @@ from django.core.mail import send_mail
|
||||
from django.template.loader import render_to_string
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from konova.sub_settings.django_settings import DEFAULT_FROM_EMAIL
|
||||
from konova.sub_settings.django_settings import DEFAULT_FROM_EMAIL, EMAIL_REPLY_TO
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -40,7 +40,8 @@ class Mailer:
|
||||
"""
|
||||
return send_mail(
|
||||
subject=subject,
|
||||
message=msg,
|
||||
message=None,
|
||||
html_message=msg,
|
||||
from_email=self.from_mail,
|
||||
recipient_list=recipient_list,
|
||||
fail_silently=self.fail_silently,
|
||||
@@ -60,6 +61,7 @@ class Mailer:
|
||||
context = {
|
||||
"user": user,
|
||||
"obj": obj,
|
||||
"EMAIL_REPLY_TO": EMAIL_REPLY_TO,
|
||||
}
|
||||
msg = render_to_string("email/sharing/shared_access_removed.html", context)
|
||||
user_mail_address = [user.email]
|
||||
|
||||
Reference in New Issue
Block a user