Merge branch 'develop' into feature/sensorfusion

rowers/views.py

@@ -1164,7 +1164,16 @@ def rower_process_twittercallback(request):
 # Process Strava Callback
 @login_required()
 def rower_process_stravacallback(request):
-    code = request.GET['code']
+    try:
+        code = request.GET['code']
+    except MultiValueDictKeyError:
+        try:
+            message = request.GET['error']
+        except MultiValueDictKeyError:
+            message = "access error"
+
+        return imports_view(request,message=message)
+            
     res = stravastuff.get_token(code)
 
     if res[0]:
@@ -4453,6 +4462,10 @@ def workout_c2import_view(request,message=""):
 # Import a workout from Strava
 @login_required()
 def workout_getstravaworkout_view(request,stravaid):
+    res = stravastuff.get_strava_workout(request.user,stravaid)
+    if not res[0]:
+        message = "Something went wrong in Strava import"
+        return imports_view(request,message=message)
         
     strokedata = res[1]
     data = res[0]