fixes for coach trial
This commit is contained in:
@@ -42,20 +42,7 @@ queuehigh = django_rq.get_queue('low')
|
||||
|
||||
inviteduration = 14 # days
|
||||
|
||||
|
||||
def handle_remove_workouts_team(ws, t):
|
||||
for w in ws:
|
||||
w.team.remove(t)
|
||||
|
||||
return 1
|
||||
|
||||
|
||||
def handle_add_workouts_team(ws, t):
|
||||
|
||||
for w in ws:
|
||||
w.team.add(t)
|
||||
|
||||
return 1
|
||||
from rowers.tasks import handle_remove_workouts_team, handle_add_workouts_team
|
||||
|
||||
|
||||
def update_team(t, name, manager, private, notes, viewing):
|
||||
@@ -128,10 +115,17 @@ def add_member(id, rower):
|
||||
except ValidationError as e: # pragma: no cover
|
||||
return(0, "Couldn't add member: "+str(e.message))
|
||||
|
||||
# if team manager is coach
|
||||
if is_coach(t.manager):
|
||||
result = add_coach(t.manager.rower, rower)
|
||||
|
||||
# code to add all workouts
|
||||
ws = Workout.objects.filter(user=rower)
|
||||
|
||||
_ = handle_add_workouts_team(ws, t)
|
||||
_ = myqueue(
|
||||
queuehigh,
|
||||
handle_add_workouts_team,
|
||||
ws, t)
|
||||
|
||||
# code to add plannedsessions
|
||||
plannedsessions = PlannedSession.objects.filter(
|
||||
@@ -154,7 +148,8 @@ def remove_member(id, rower):
|
||||
# remove the team from rower's workouts:
|
||||
ws = Workout.objects.filter(user=rower, team=t)
|
||||
|
||||
_ = handle_remove_workouts_team(ws, t)
|
||||
|
||||
_ = myqueue(queuehigh,handle_remove_workouts_team,ws, t)
|
||||
|
||||
# set_teamplanexpires(rower)
|
||||
return (id, 'Member removed')
|
||||
|
||||
Reference in New Issue
Block a user