Private
Public Access
1
0

Merge branch 'release/v11.13'

This commit is contained in:
Sander Roosendaal
2020-02-22 15:39:04 +01:00
2 changed files with 4 additions and 2 deletions
+2
View File
@@ -1589,6 +1589,8 @@ def new_workout_from_file(r, f2,
impeller=impeller, impeller=impeller,
) )
job = myqueue(queuehigh,handle_calctrimp,id,f2,r.ftp,r.sex,r.hrftp,r.max,r.rest)
return (id, message, f2) return (id, message, f2)
+2 -2
View File
@@ -259,9 +259,9 @@ def is_rower_team_member(user,rower):
for team in teams: for team in teams:
if team.private == 'open': if team.private == 'open':
if team in rower.team.all(): if team in user.rower.team.all():
return True return True
if team.manager == rower.user: if team.manager == user:
return True return True
return False return False