Merge branch 'release/v9.30'
This commit is contained in:
@@ -145,8 +145,8 @@ class UserFactory(factory.DjangoModelFactory):
|
||||
email = factory.LazyAttribute(lambda _: faker.email())
|
||||
username = factory.LazyAttribute(lambda _: faker.profile()['username'])
|
||||
|
||||
first_name = faker.name().split(' ')[0]
|
||||
last_name = faker.name().split(' ')[0]
|
||||
first_name = factory.LazyAttribute(lambda _:faker.name().split(' ')[0])
|
||||
last_name = factory.LazyAttribute(lambda _:faker.name().split(' ')[0])
|
||||
|
||||
class RaceFactory(factory.DjangoModelFactory):
|
||||
class Meta:
|
||||
|
||||
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
Binary file not shown.
@@ -716,7 +716,7 @@ def plannedsession_teamcreate_view(request,
|
||||
})
|
||||
|
||||
# Manager edits sessions for entire team
|
||||
@user_passes_test(iscoachmember,login_url="/rowers/paidplans/",
|
||||
@user_passes_test(hasplannedsessions,login_url="/rowers/paidplans/",
|
||||
message="This functionality requires a Coach or Self-Coach plan",
|
||||
redirect_field_name=None)
|
||||
def plannedsession_teamedit_view(request,
|
||||
|
||||
@@ -205,7 +205,7 @@ def rower_teams_view(request,message='',successmessage=''):
|
||||
potentialcoaches = [c for c in potentialcoaches if teams.get_coach_club_size(c.rower)<c.rower.clubsize]
|
||||
|
||||
|
||||
coachees = teams.coach_getcoachees(r)
|
||||
coachees = teams.coach_getcoachees(request.user.rower)
|
||||
|
||||
if request.user.rower.rowerplan == 'coach':
|
||||
potentialathletes = Rower.objects.filter(
|
||||
|
||||
Reference in New Issue
Block a user