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

Merge branch 'release/error500'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-01-28 20:52:48 +01:00
parent 0e49ef7a94 35742a7cd0
commit ed6d569105
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/templates/500.html
View File

@@ -11,6 +11,13 @@
<p>
The site reported an internal server error. If this behavior repeats, please inform us by using the contact form at the bottom of this page. This allows us to improve the site's behaviour.
</p>
<p>
You can also report an issue on the Rowsandall Bitbucket issue list:
</p>
<div class="grid_2 alpha">
<a class="button red small" href="https://bitbucket.org/sanderroosendaal/rowsandall/issues/new">Report an issue</a>
</div>
</div>
{% endblock %}

2
rowers/views.py
View File

@@ -3799,6 +3799,7 @@ def workout_upload_view(request,message=""):
os.remove(f_to_be_deleted)
# Some people try to upload Concept2 logbook summaries
if fileformat == 'c2log':
os.remove(f2)
message = "This C2 logbook summary does not contain stroke data. Please download the Export Stroke Data file from the workout details on the C2 logbook."
url = reverse(workout_upload_view,
@@ -3807,6 +3808,7 @@ def workout_upload_view(request,message=""):
return response
# Some people try to upload RowPro summary logs
if fileformat == 'rowprolog':
os.remove(f2)
message = "This RowPro logbook summary does not contain stroke data. Please use the Stroke Data CSV file for the individual workout in your log."
url = reverse(workout_upload_view,