Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Simplify code to check for ownership of days

Roland Geider272ccf9dabc3
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index 9abae40b8..fef5314d3 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -52,7 +52,7 @@ class DeleteWorkoutDayTestCase(WorkoutManagerTestCase):
count_after = Day.objects.count()
if fail:
- self.assertIn(response.status_code, (302, 403))
+ self.assertIn(response.status_code, (302, 404))
self.assertTemplateUsed('login.html')
self.assertEqual(count_before, count_after)
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 9736e9ac9..264f3f8a5 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -120,12 +120,9 @@ def delete(request, pk):
'''
Deletes the given day
'''
- day = get_object_or_404(Day, pk=pk)
- if day.get_owner_object().user == request.user:
- day.delete()
- return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': day.training_id}))
- else:
- return HttpResponseForbidden()
+ day = get_object_or_404(Day, training__user=request.user, pk=pk)
+ day.delete()
+ return HttpResponseRedirect(reverse('manager:workout:view', kwargs={'id': day.training_id}))
@login_required