From e407797a28eb866c06dafe2eb8676c84ad1d7427 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 13 Apr 2017 11:54:03 +0200
Subject: [PATCH] export by manager to correct Strava/ST/RK

---
 rowers/views.py | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/rowers/views.py b/rowers/views.py
index 41747d68..e9d6c065 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1007,6 +1007,7 @@ def workout_strava_upload_view(request,id=0):
 	# ready to upload. Hurray
         try:
 	    w = Workout.objects.get(id=id)
+            r = w.user
         except Workout.DoesNotExist:
 	    raise Http404("Workout doesn't exist")
 	if (checkworkoutuser(request.user,w)):
@@ -1089,16 +1090,18 @@ def workout_strava_upload_view(request,id=0):
 @login_required()
 def workout_c2_upload_view(request,id=0):
     message = ""
-    try:
-	thetoken = c2_open(request.user)
-    except C2NoTokenError:
-	return HttpResponseRedirect("/rowers/me/c2authorize/")
-
     # ready to upload. Hurray
     try:
         w = Workout.objects.get(id=id)
+        r = w.user
     except Workout.DoesNotExist:
 	raise Http404("Workout doesn't exist")
+
+    try:
+	thetoken = c2_open(r.user)
+    except C2NoTokenError:
+	return HttpResponseRedirect("/rowers/me/c2authorize/")
+
     if (checkworkoutuser(request.user,w)):
 	c2userid = c2stuff.get_userid(thetoken)
         if not c2userid:
@@ -1175,15 +1178,17 @@ def workout_c2_upload_view(request,id=0):
 def workout_runkeeper_upload_view(request,id=0):
     message = ""
     try:
-	thetoken = runkeeper_open(request.user)
+        w = Workout.objects.get(id=id)
+        r = w.user
+    except Workout.DoesNotExist:
+	raise Http404("Workout doesn't exist")
+
+    try:
+	thetoken = runkeeper_open(r.user)
     except RunKeeperNoTokenError:
 	return HttpResponseRedirect("/rowers/me/runkeeperauthorize/")
 
     # ready to upload. Hurray
-    try:
-        w = Workout.objects.get(id=id)
-    except Workout.DoesNotExist:
-	raise Http404("Workout doesn't exist")
 
     if (checkworkoutuser(request.user,w)):
 	data = runkeeperstuff.createrunkeeperworkoutdata(w)
@@ -1236,17 +1241,19 @@ def workout_runkeeper_upload_view(request,id=0):
 @login_required()
 def workout_sporttracks_upload_view(request,id=0):
     message = ""
-    try:
-	thetoken = sporttracks_open(request.user)
-    except SportTracksNoTokenError:
-	return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
-
     # ready to upload. Hurray
     try:
         w = Workout.objects.get(id=id)
+        r = w.user
     except Workout.DoesNotExist:
 	raise Http404("Workout doesn't exist")
 
+    try:
+	thetoken = sporttracks_open(r.user)
+    except SportTracksNoTokenError:
+	return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
+
+
     if (checkworkoutuser(request.user,w)):
 	data = sporttracksstuff.createsporttracksworkoutdata(w)
         if not data: