From 6cd745379f735662d114856bbdf309fbc4517c8a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 23 Feb 2019 15:29:47 +0100 Subject: [PATCH 1/3] some bug fixes --- rowers/tests/statements.py | 4 ++-- rowers/views/planviews.py | 2 +- rowers/views/teamviews.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rowers/tests/statements.py b/rowers/tests/statements.py index 8fcf1307..1f607745 100644 --- a/rowers/tests/statements.py +++ b/rowers/tests/statements.py @@ -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: diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 83f1678a..ce698175 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -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, diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py index 0fff0eb4..821885bf 100644 --- a/rowers/views/teamviews.py +++ b/rowers/views/teamviews.py @@ -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) Date: Sat, 23 Feb 2019 15:49:47 +0100 Subject: [PATCH 2/3] passing tests --- rowers/tests/testdata/testdata.csv.gz | Bin 12537 -> 12537 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index b6e2d423a67bc7dd35d418b27844d4185c5f9696..d9ef35aa7842bfb35bbc121b7cdce7e6200c133a 100644 GIT binary patch delta 16 XcmeyF_%o4RzMF$%ZDip__D==?J!}TY delta 16 XcmeyF_%o4RzMF$%b9li<_D==?J%t9! From f458d55f7ba46a9cd991db445258bb8db5e99616 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 23 Feb 2019 15:57:18 +0100 Subject: [PATCH 3/3] tested --- rowers/tests/testdata/testdata.csv.gz | Bin 12537 -> 12537 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index d9ef35aa7842bfb35bbc121b7cdce7e6200c133a..2542fe700c4b693671ada0cd196db9a4791836f0 100644 GIT binary patch delta 15 WcmeyF_%o4BzMF$1Ic_7{X9EB=3