solves #502 fixed

rowers/views/workoutviews.py

@@ -3981,6 +3981,8 @@ def workout_upload_view(request,
             notes = form.cleaned_data['notes']
             offline = form.cleaned_data['offline']
 
+            print('aap',form.cleaned_data)
+            
             race = None
             if optionsform.is_valid():
                 make_plot = optionsform.cleaned_data['make_plot']
@@ -4021,6 +4023,7 @@ def workout_upload_view(request,
             f2 = res[1] # file name incl media directory
 
             if not offline:
+                print('noot',notes)
                 id,message,f2 = dataprep.new_workout_from_file(
                     r,f2,
                     workouttype=workouttype,
@@ -4028,7 +4031,7 @@ def workout_upload_view(request,
                     boattype=boattype,
                     makeprivate=makeprivate,
                     title = t,
-                    notes=''
+                    notes=notes,
                 )
             else:
                 workoutsbox = Mailbox.objects.filter(name='workouts')[0]
@@ -5289,7 +5292,11 @@ class GraphDelete(DeleteView):
 def workout_code_delete_view(request,id=0):
     pk = encoder.decode_hex(id)
 
-    url = reverse('workout_delete',kwargs={'pk':pk})
+    try:
+        w = Workout.objects.get(pk=pk)
+        url = reverse('workout_delete',kwargs={'pk':pk})
+    except Workout.DoesNotExist:
+        url = reverse('workout_delete',kwargs={'pk':id})
 
     return HttpResponseRedirect(url)
     
@@ -5341,7 +5348,13 @@ class WorkoutDelete(DeleteView):
         return reverse('workouts_view')
 
     def get_object(self, *args, **kwargs):
-        obj = super(WorkoutDelete, self).get_object(*args, **kwargs)
+        workout_pk = self.kwargs['pk']
+        try:
+            obj = Workout.objects.get(pk=workout_pk)
+        except Workout.DoesNotExist:
+            workout_pk = encoder.decode_hex(workout_pk)
+            obj = Workout.objects.get(pk=workout_pk)
+            #        obj = super(WorkoutDelete, self).get_object(*args, **kwargs)
         if not checkaccessuser(self.request.user,obj.user):
             raise PermissionDenied('You are not allowed to delete this workout')