Merge branch 'hotfix/v2.13'

rowers/views.py

@@ -1641,7 +1641,6 @@ def rower_underarmour_authorize(request):
     state = str(uuid4())
 
     redirect_uri = UNDERARMOUR_REDIRECT_URI
-    redirect_uri = 'http://localhost:8000/underarmour_callback'
     
     url = 'https://www.mapmyfitness.com/v7.1/oauth2/authorize/?' \
                 'client_id={0}&response_type=code&redirect_uri={1}'.format(
@@ -4201,6 +4200,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
     if request.method == 'POST' and 'savefavorite' in request.POST:
         workstrokesonly = request.POST['workstrokesonlysave']
         reststrokes = not workstrokesonly
+	r = Rower.objects.get(user=request.user)
         f = FavoriteChart(user=r,xparam=xparam,
                           yparam1=yparam1,yparam2=yparam2,
                           plottype=plottype,workouttype=workouttype,