sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v5.27'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-12-03 20:31:30 +01:00
parent 7a61703378 fdbabd57ab
commit 53c63ff317
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/management/commands/processemail.py
View File

@@ -48,9 +48,10 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False):
except AttributeError: except AttributeError:
filename = fileobj[6:] filename = fileobj[6:]
# test if file exists and is not empty # test if file exists and is not empty
try: try:
with open(filename,'r') as fop: with open('media/'+filename,'r') as fop:
line = fop.readline() line = fop.readline()
except IOError: except IOError:
return 0 return 0
@@ -58,6 +59,7 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False):
workoutid = [ workoutid = [
make_new_workout_from_email(rower, filename, title,testing=testing) make_new_workout_from_email(rower, filename, title,testing=testing)
] ]
if workoutid[0]: if workoutid[0]:
link = settings.SITE_URL+reverse( link = settings.SITE_URL+reverse(
rower.defaultlandingpage, rower.defaultlandingpage,
@@ -155,9 +157,6 @@ class Command(BaseCommand):
else: else:
body = message.get_body() body = message.get_body()
uploadoptions = uploads.upload_options(body) uploadoptions = uploads.upload_options(body)
from_address = get_from_address(message) from_address = get_from_address(message)