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

Merge tag 'v5.37' into develop

Browse Source 
bugfix
This commit is contained in:
Sander Roosendaal
2017-12-17 08:47:42 +01:00
parent 8d4918095f 3a3bf42d1d
commit e5a1179125
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/sporttracksstuff.py
+1 -1
View File
@@ -70,7 +70,7 @@ def sporttracks_open(user):
raise SportTracksNoTokenError("User has no token") raise SportTracksNoTokenError("User has no token")
else: else:
if (timezone.now()>r.sporttrackstokenexpirydate): if (timezone.now()>r.sporttrackstokenexpirydate):
thetoken = sporttracksstuff.rower_sporttracks_token_refresh(user) thetoken = rower_sporttracks_token_refresh(user)
else: else:
thetoken = r.sporttrackstoken thetoken = r.sporttrackstoken
rowers/views.py
+2 -1
View File
@@ -9393,7 +9393,8 @@ def workout_upload_view(request,
if f is not None: if f is not None:
res = handle_uploaded_file(f) res = handle_uploaded_file(f)
else: else:
messages.error("Something went wrong - no file attached") messages.error(request,
"Something went wrong - no file attached")
url = reverse(workout_upload_view) url = reverse(workout_upload_view)
if is_ajax: if is_ajax:
return JSONResponse({'result':0,'url':0}) return JSONResponse({'result':0,'url':0})