bug fixes for bulk actions
This commit is contained in:
@@ -2039,14 +2039,17 @@ def workouts_setrpe_view(request,userid=0):
|
||||
@login_required()
|
||||
def workouts_bulk_actions(request):
|
||||
r = getrower(request.user)
|
||||
action = request.session['action']
|
||||
workoutids = request.session['ids']
|
||||
action = request.session.get('action','export')
|
||||
workoutids = request.session.get('ids',[])
|
||||
workouts = []
|
||||
exportchoice = 'strava'
|
||||
try:
|
||||
for encid in workoutids:
|
||||
w = get_workout_by_opaqueid(request, encid)
|
||||
if w.user == r:
|
||||
workouts.append(w)
|
||||
else:
|
||||
messages.error(request,'Bulk actions are not accessible to coaches')
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
@@ -2055,6 +2058,9 @@ def workouts_bulk_actions(request):
|
||||
form = WorkoutMultipleCompareForm(request.POST)
|
||||
if form.is_valid() and actionform.is_valid():
|
||||
workouts = form.cleaned_data['workouts']
|
||||
if len(workouts) == 0:
|
||||
url = reverse('workouts_view')
|
||||
return HttpResponseRedirect(url)
|
||||
action = actionform.cleaned_data['action']
|
||||
if action == 'remove':
|
||||
for w in workouts:
|
||||
@@ -2075,7 +2081,10 @@ def workouts_bulk_actions(request):
|
||||
destination=destination))
|
||||
url = reverse('workouts_view')
|
||||
return HttpResponseRedirect(url)
|
||||
|
||||
else:
|
||||
if len(workouts) == 0:
|
||||
url = reverse(workouts_view)
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
exportchoice = ExportChoices()
|
||||
actionform = WorkoutBulkActions()
|
||||
@@ -2084,7 +2093,6 @@ def workouts_bulk_actions(request):
|
||||
form.fields["workouts"].queryset = Workout.objects.filter(id__in=[w.id for w in workouts])
|
||||
form.fields["workouts"].initial = workouts
|
||||
|
||||
|
||||
return render(request,'workout_bulk_actions.html',
|
||||
{'action':action,
|
||||
'exportchoice':exportchoice,
|
||||
|
||||
Reference in New Issue
Block a user