Merge tag 'v1.71' into develop

hotfix RK token export page
2017-03-24 19:30:07 +01:00
parent bf2eb72fe4 f3f92af1cf
commit d8c5454ac4
1 changed files with 5 additions and 1 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4007,7 +4007,11 @@ def workout_export_view(request,id=0, message="", successmessage=""):
        c2userid = c2stuff.get_userid(thetoken)
    else:
        c2userid = 0
-
+
+    try:
+        rktoken = runkeeper_open(request.user)
+    except RunKeeperNoTokenError:
+        rktoken = 0
        
    if (checkworkoutuser(request.user,row)) and rktoken:
        rkuserid = runkeeperstuff.get_userid(rktoken)