c2, strava done, almost done st

rowers/views.py

@@ -1661,7 +1661,6 @@ def workout_c2_upload_view(request,id=0):
     w = get_workout(id)
     r = w.user
     
-
     try:
         message,c2id = c2stuff.workout_c2_upload(request.user,w)
     except NoTokenError:
@@ -1678,7 +1677,9 @@ def workout_c2_upload_view(request,id=0):
 		      'id':str(w.id),
 		  })
 
-    return HttpResponseRedirect(url)
+    response = HttpResponseRedirect(url)
+
+    return response
 
 # Upload workout to RunKeeper
 @login_required()
@@ -1821,6 +1822,7 @@ def workout_sporttracks_upload_view(request,id=0):
 
     if (checkworkoutuser(request.user,w)):
 	data = sporttracksstuff.createsporttracksworkoutdata(w)
+
         if not data:
             message = "Data error"
             messages.error(request,message)
@@ -1829,7 +1831,7 @@ def workout_sporttracks_upload_view(request,id=0):
 		              'id':str(w.id),
 		          })
             return HttpResponseRedirect(url)
-        
+
 	authorizationstring = str('Bearer ' + thetoken)
 	headers = {'Authorization': authorizationstring,
 		   'user-agent': 'sanderroosendaal',
@@ -1838,6 +1840,7 @@ def workout_sporttracks_upload_view(request,id=0):
 	url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json"
 	response = requests.post(url,headers=headers,data=json.dumps(data))
 
+        
 	# check for duplicate error first
 	if (response.status_code == 409 ):
 	    message = "Duplicate error"
@@ -1845,7 +1848,7 @@ def workout_sporttracks_upload_view(request,id=0):
 	    w.uploadedtosporttracks = -1
 	    w.save()
 	elif (response.status_code == 201 or response.status_code==200):
-	    s= json.loads(response.text)
+	    s= response.json()
 	    sporttracksid = sporttracksstuff.getidfromresponse(response)
 	    w.uploadedtosporttracks = sporttracksid
 	    w.save()