Merge branch 'release/v20.5.1'

rowers/models.py

@@ -3600,6 +3600,8 @@ class Workout(models.Model):
                     )
             except ValueError:
                 stri = self.name
+            except AttributeError:
+                return "No workout"
         else:
             try:
                 stri = u'{d} {n} {dist}m {duration} {workouttype} {boattype} {ownerfirst} {ownerlast}'.format(

rowers/views/workoutviews.py

@@ -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']
+    action = request.session.get('action','export')
-    workoutids = request.session['ids']
+    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:
@@ -2068,14 +2074,21 @@ def workouts_bulk_actions(request):
                         integration = importsources[destination](request.user)
                         try:
                             id = integration.workout_export(w)
-                            messages.info(request,'Workout {id} exported to {destination}'.format(id=encoder.encode_hex(w.id),
+                            messages.info(request,
+                                          'Workout {id} exported to {destination}'.format(
+                                              id=encoder.encode_hex(w.id),
                                               destination=destination))
                         except NoTokenError:
-                            messages.error(request,'Export to {destination} of workout {id} failed'.format(id=encoder.encode_hex(w.id),
+                            messages.error(request,
+                                           'Export to {destination} of workout {id} failed'.format(
+                                               id=encoder.encode_hex(w.id),
                                                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 +2097,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,