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

Merge branch 'hotfix/v9.34'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-27 08:15:03 +01:00
parent 83a5578eb1 c847392d74
commit dbf91807e5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -168,11 +168,11 @@ def workout_summary_to_df(
weightvalues.append(w.weightvalue) weightvalues.append(w.weightvalue)
notes.append(w.notes) notes.append(w.notes)
tcx_link = SITE_URL+'/rowers/workout/{id}/emailtcx'.format( tcx_link = SITE_URL+'/rowers/workout/{id}/emailtcx'.format(
id=w.id id=encoder.encode_hex(w.id)
) )
tcx_links.append(tcx_link) tcx_links.append(tcx_link)
csv_link = SITE_URL+'/rowers/workout/{id}/emailcsv'.format( csv_link = SITE_URL+'/rowers/workout/{id}/emailcsv'.format(
id=w.id id=encoder.encode_hex(w.id)
) )
csv_links.append(csv_link) csv_links.append(csv_link)
trimps.append(workout_trimp(w)[0]) trimps.append(workout_trimp(w)[0])

2
rowers/tasks.py
View File

@@ -1790,7 +1790,7 @@ def handle_sendemail_coachrequest_accepted(email,coachname,name,
} }
res = send_template_email(from_email,[fullemail], res = send_template_email(from_email,[fullemail],
subject,'coachrequestacceptedmail.html', subject,'coachrequestacceptedemail.html',
d, d,
**kwargs) **kwargs)
return 1 return 1