Private
Public Access
1
0

going through the tests

This commit is contained in:
2024-12-30 17:22:42 +01:00
parent 9c7f06684e
commit 2759fd56eb
39 changed files with 135 additions and 500 deletions

View File

@@ -2101,7 +2101,7 @@ def workouts_bulk_actions(request):
teams = Team.objects.filter(manager=request.user)
assignchoices.fields["rowers"].queryset = Rower.objects.filter(
team__in=teams
).distinct().order_by("user__last_name", "user__first_name").exclude(rowerplan='freecoach')
).distinct().order_by("user__last_name", "user__first_name")
assignchoices.fields["rowers"].initial = []
form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = Workout.objects.filter(id__in=[w.id for w in workouts])
@@ -5191,9 +5191,6 @@ def workout_upload_view(request,
r = getrower(request.user)
if r.imports_are_private:
uploadoptions['makeprivate'] = True
if r.rowerplan == 'freecoach': # pragma: no cover
url = reverse('team_workout_upload_view')
return HttpResponseRedirect(url)
breadcrumbs = [
{
@@ -5622,7 +5619,7 @@ def workout_upload_view(request,
# This is the main view for processing uploaded files
@user_passes_test(iscoachmember, login_url="/rowers/paidplans", redirect_field_name=None,
@user_passes_test(ispromember, login_url="/rowers/paidplans", redirect_field_name=None,
message="This functionality requires a Coach plan or higher")
def team_workout_upload_view(request, userid=0, message="",
successmessage="",
@@ -5659,11 +5656,7 @@ def team_workout_upload_view(request, userid=0, message="",
rowerform.fields.pop('email')
rowers = Rower.objects.filter(
coachinggroups__in=[r.mycoachgroup]
).exclude(
rowerplan='freecoach'
).distinct()
if r.rowerplan == 'freecoach': # pragma: no cover
rowers = rowers.exclude(rowerplan='basic')
rowerform.fields['user'].queryset = User.objects.filter(
rower__in=rowers).distinct()
@@ -5803,11 +5796,7 @@ def team_workout_upload_view(request, userid=0, message="",
rowers = Rower.objects.filter(
coachinggroups__in=[r.mycoachgroup]
).exclude(
rowerplan='freecoach'
).distinct()
if r.rowerplan == 'freecoach': # pragma: no cover
rowers = rowers.exclude(rowerplan='basic')
rowerform.fields['user'].queryset = User.objects.filter(
rower__in=rowers).distinct()