Merge tag 'v5.37' into develop

bugfix
2017-12-17 08:47:42 +01:00
parent 8d4918095f 3a3bf42d1d
commit e5a1179125
2 changed files with 3 additions and 2 deletions
@@ -70,7 +70,7 @@ def sporttracks_open(user):
 	raise SportTracksNoTokenError("User has no token")
    else:
 	if (timezone.now()>r.sporttrackstokenexpirydate):
-	    thetoken = sporttracksstuff.rower_sporttracks_token_refresh(user)
+	    thetoken = rower_sporttracks_token_refresh(user)
 	else:
 	    thetoken = r.sporttrackstoken

@@ -9393,7 +9393,8 @@ def workout_upload_view(request,
            if f is not None:
 	        res = handle_uploaded_file(f)
            else:
-                messages.error("Something went wrong - no file attached")
+                messages.error(request,
+                               "Something went wrong - no file attached")
                url = reverse(workout_upload_view)
                if is_ajax:
                    return JSONResponse({'result':0,'url':0})