From 096d4e9d342a64b0422f1857788a96af29d3a19d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 5 May 2020 10:58:52 +0200 Subject: [PATCH] setting user required in team upload --- rowers/views/statements.py | 2 +- rowers/views/workoutviews.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 93a5cb17..a999339f 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -518,7 +518,7 @@ def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False): def getrower(user): try: - if user.is_anonymous: + if user is None or user.is_anonymous: return None except AttributeError: if User.objects.get(id=user).is_anonymous: diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 24e48cfd..105c069b 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -5090,7 +5090,8 @@ def team_workout_upload_view(request,message="", rowers = rowers.exclude(rowerplan='basic') rowerform.fields['user'].queryset = User.objects.filter(rower__in=rowers).distinct() - if form.is_valid(): + rowerform.fields['user'].required = True + if form.is_valid() and rowerform.is_valid(): f = request.FILES.get('file',False) if f: res = handle_uploaded_file(f)