From 754f9793971f63074c3aebe8a43af8789548d0eb Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 9 Sep 2019 17:09:48 +0200 Subject: [PATCH] small fix --- rowers/urls.py | 2 +- rowers/views/workoutviews.py | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rowers/urls.py b/rowers/urls.py index 4c6fbc50..5720d27a 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -381,7 +381,7 @@ urlpatterns = [ re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/(?P\d+)/$', views.workout_add_chart_view,name='workout_add_chart_view'), re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/$',views.workout_add_chart_view,name='workout_add_chart_view'), - re_path(r'^workout/(?P\d+)/delete/$',login_required( + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$',login_required( views.WorkoutDelete.as_view()), name='workout_delete'), # re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$',login_required( diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index ac78ea5b..f8d0f49e 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -5351,10 +5351,13 @@ class WorkoutDelete(DeleteView): workout_pk = self.kwargs['pk'] try: obj = Workout.objects.get(pk=workout_pk) - except Workout.DoesNotExist: + except (ValueError,Workout.DoesNotExist): workout_pk = encoder.decode_hex(workout_pk) - obj = Workout.objects.get(pk=workout_pk) - # obj = super(WorkoutDelete, self).get_object(*args, **kwargs) + try: + obj = Workout.objects.get(pk=workout_pk) + except Workout.DoesNotExist: + raise Http404("One of the workouts doesn't exist") + # 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')