sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v5.32'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-12-10 11:13:23 +01:00
parent 4896b5c315 87e3c19f7c
commit cf79b3eb9b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/stravastuff.py
View File

@@ -311,7 +311,10 @@ def handle_stravaexport(f2,workoutname,stravatoken,description='',
# description doesn't work yet. Have to wait for stravalib to update # description doesn't work yet. Have to wait for stravalib to update
if res: if res:
act = client.update_activity(res.id,activity_type=activity_type,description=description,device_name='Rowsandall.com') try:
act = client.update_activity(res.id,activity_type=activity_type,description=description,device_name='Rowsandall.com')
except TypeError:
act = client.update_activity(res.id,activity_type=activity_type,description=description)
else: else:
message = 'Strava activity update timed out.' message = 'Strava activity update timed out.'
return (0,message) return (0,message)

5
rowers/views.py
View File

@@ -7462,7 +7462,10 @@ def workout_flexchart3_view(request,*args,**kwargs):
if not request.user.is_anonymous(): if not request.user.is_anonymous():
r = getrower(request.user) r = getrower(request.user)
if favoritenr>=0 and r.showfavoritechartnotes: if favoritenr>=0 and r.showfavoritechartnotes:
favoritechartnotes = favorites[favoritenr].notes try:
favoritechartnotes = favorites[favoritenr].notes
except IndexError:
favoritechartnotes = ''
else: else:
favoritechartnotes = '' favoritechartnotes = ''
else: else: