Private
Public Access
1
0

join working but needs improvement (form with title)

This commit is contained in:
Sander Roosendaal
2017-11-22 18:06:45 +01:00
parent 6a76ba05fa
commit 618e64579c
5 changed files with 269 additions and 3 deletions

View File

@@ -4191,6 +4191,43 @@ def workout_setprivate_view(request,id,
return HttpResponseRedirect(url)
# Joining workout
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
def workouts_join_view(request):
promember=0
if not request.user.is_anonymous():
r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user)
if result:
promember=1
if request.method == 'POST' and 'workouts' in request.POST:
form = WorkoutMultipleCompareForm(request.POST)
if form.is_valid():
cd = form.cleaned_data
workouts = cd['workouts']
ids = [int(w.id) for w in workouts]
request.session['ids'] = ids
id,message = dataprep.join_workouts(r,ids)
if message:
messages.error(request,message)
url = reverse(workout_edit_view,
kwargs = {
'id':int(id),
})
return HttpResponseRedirect(url)
else:
return HttpResponse("Form is not valid")
else:
url = reverse(workouts_join_select)
return HttpResponseRedirect(url)
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
def workouts_join_select(request,
startdatestring="",
@@ -4337,7 +4374,7 @@ def workouts_join_select(request,
messages.info(request,successmessage)
messages.error(request,message)
return render(request, 'team_compare_select.html',
return render(request, 'workout_join_select.html',
{'workouts': workouts,
'dateform':dateform,
'startdate':startdate,
@@ -8816,7 +8853,8 @@ def workout_upload_view(request,
optionsform = UploadOptionsForm(request.POST)
if form.is_valid():
f = request.FILES['file']
# f = request.FILES['file']
f = form.cleaned_data['file']
res = handle_uploaded_file(f)
t = form.cleaned_data['title']