holm/django-helpdeskmig
1
0
Fork 0
mirror of https://gitea.mueller.network/extern/django-helpdesk.git synced 2024-11-26 01:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use file paths because they don't work on S3

Browse Source 
Fixes #721 on develop but not on master
This commit is contained in:
Timothy Hobbs 2019-03-27 17:38:00 +01:00
parent 7f27eb9428
commit b43e60875a
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
helpdesk/templated_email.py
View File

@ -100,13 +100,10 @@ def send_templated_mail(template_name,
if files: if files:
for filename, filefield in files: for filename, filefield in files:
mime = mimetypes.guess_type(filename) filefield.open('rb')
if mime[0] is not None and mime[0] == "text/plain": content = filefield.read()
with open(filefield.path, 'r') as attachedfile:
content = attachedfile.read()
msg.attach(filename, content) msg.attach(filename, content)
else: filefield.close()
msg.attach_file(filefield.path)
logger.debug('Sending email to: {!r}'.format(recipients)) logger.debug('Sending email to: {!r}'.format(recipients))
try: try: