From 209a9e193cfa689a425bdb167a371bd1bc94d36c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 18 Feb 2017 20:26:36 +0100 Subject: [PATCH] bugfix promember check --- rowers/stravastuff.py | 6 +++++- rowers/views.py | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 0987d2cb..7c23c596 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -233,7 +233,11 @@ def handle_stravaexport(f2,workoutname,stravatoken,description=''): client = stravalib.Client(access_token=stravatoken) act = client.upload_activity(f2,'tcx',name=workoutname) - res = act.wait(poll_interval=5.0) + try: + res = act.wait(poll_interval=5.0) + except: + res = 0 + # description doesn't work yet. Have to wait for stravalib to update diff --git a/rowers/views.py b/rowers/views.py index 2e50b45e..5011e1d0 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -207,8 +207,11 @@ def iscoachmember(user): # Check if a user is a Pro member def ispromember(user): - r = Rower.objects.get(user=user) - result = user.is_authenticated() and (r.rowerplan=='pro' or r.rowerplan=='coach') + if not user.is_anonymous(): + r = Rower.objects.get(user=user) + result = user.is_authenticated() and (r.rowerplan=='pro' or r.rowerplan=='coach') + else: + result = False return result # User registration