Private
Public Access
1
0

Merge branch 'release/v16.4.10' into develop

This commit is contained in:
Sander Roosendaal
2021-06-10 09:40:22 +02:00
2 changed files with 5 additions and 5 deletions

View File

@@ -3064,16 +3064,16 @@ def df_from_summary(data):
try:
time += split['time']/10.
times.append(time)
except (KeyError, TypeError):
except (KeyError, TypeError): # pragma: no cover
times.append(0)
try:
elapsed_distance += split['distance']
distances.append(elapsed_distance)
except (KeyError, TypeError):
except (KeyError, TypeError): # pragma: no cover
distances.append(0)
try:
spms.append(split['stroke_rate'])
except (KeyError, TypeError):
except (KeyError, TypeError): # pragma: no cover
spms.append(0)
try:
hrs.append(split['heart_rate']['average'])

View File

@@ -540,7 +540,7 @@ def workout_getnkworkout_all(request,startdatestring='',enddatestring=''):
def workout_nkimport_view(request,userid=0,after=0,before=0):
startdate,enddate = get_dates_timeperiod(request,defaulttimeperiod='last30')
r = getrequestrower(request,userid=userid)
if r.user != request.user:
if r.user != request.user: # pragma: no cover
messages.error(request,'You can only access your own workouts on the NK Logbook, not those of your athletes')
url = reverse('workout_nkimport_view',kwargs={'userid':request.user.id})
return HttpResponseRedirect(url)
@@ -1605,7 +1605,7 @@ importsources = {
@permission_required('rower.is_not_freecoach',fn=get_user_by_userid, raise_exception=True)
def workout_getrp3importview(request,externalid):
r = getrequestrower(request)
if r.user != request.user:
if r.user != request.user: # pragma: no cover
messages.error(request,'You can only access your own workouts on the NK Logbook, not those of your athletes')
url = reverse('workout_rp3import_view',kwargs={'userid':request.user.id})
return HttpResponseRedirect(url)