sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

small fix

Browse Source
This commit is contained in:
Sander Roosendaal
2019-09-09 17:09:48 +02:00
parent 1180b72edc
commit 754f979397
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/urls.py
View File

@@ -381,7 +381,7 @@ urlpatterns = [
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/addstatic/(?P<plotnr>\d+)/$', re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/addstatic/(?P<plotnr>\d+)/$',
views.workout_add_chart_view,name='workout_add_chart_view'), views.workout_add_chart_view,name='workout_add_chart_view'),
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/addstatic/$',views.workout_add_chart_view,name='workout_add_chart_view'), re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/addstatic/$',views.workout_add_chart_view,name='workout_add_chart_view'),
re_path(r'^workout/(?P<pk>\d+)/delete/$',login_required( re_path(r'^workout/(?P<pk>\b[0-9A-Fa-f]+\b)/delete/$',login_required(
views.WorkoutDelete.as_view()), views.WorkoutDelete.as_view()),
name='workout_delete'), name='workout_delete'),
# re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/delete/$',login_required( # re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/delete/$',login_required(

9
rowers/views/workoutviews.py
View File

@@ -5351,10 +5351,13 @@ class WorkoutDelete(DeleteView):
workout_pk = self.kwargs['pk'] workout_pk = self.kwargs['pk']
try: try:
obj = Workout.objects.get(pk=workout_pk) obj = Workout.objects.get(pk=workout_pk)
except Workout.DoesNotExist: except (ValueError,Workout.DoesNotExist):
workout_pk = encoder.decode_hex(workout_pk) workout_pk = encoder.decode_hex(workout_pk)
obj = Workout.objects.get(pk=workout_pk) try:
# obj = super(WorkoutDelete, self).get_object(*args, **kwargs) 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): if not checkaccessuser(self.request.user,obj.user):
raise PermissionDenied('You are not allowed to delete this workout') raise PermissionDenied('You are not allowed to delete this workout')