Self hosted FLOSS fitness/workout, nutrition and weight tracker
Simplify day delete URL
Roland Geider9296baacd11f
diff --git a/wger/manager/templates/mobile/tags/render_day.html b/wger/manager/templates/mobile/tags/render_day.htmlindex 3cd5bdf97..4e69ea681 100644--- a/wger/manager/templates/mobile/tags/render_day.html+++ b/wger/manager/templates/mobile/tags/render_day.html@@ -42,7 +42,7 @@alt="{% trans 'Edit' %}">{% trans 'Edit' %}</a>- <a href="{% url 'wger.manager.views.day.delete' workout.id day.obj.id %}"+ <a href="{% url 'day-delete' day.obj.id %}"title="{% trans 'Delete' %}"data-role="button"><img src="{% static 'images/icons/trash.svg' %}"diff --git a/wger/manager/templates/tags/render_day.html b/wger/manager/templates/tags/render_day.htmlindex bc9c938ba..7b49df8d9 100644--- a/wger/manager/templates/tags/render_day.html+++ b/wger/manager/templates/tags/render_day.html@@ -24,7 +24,7 @@ $(document).ready(function() {{{ day.days_of_week.text }} – {{ day.obj.description }}<span class="editoptions" style="float: right;">- <a href="{% url 'wger.manager.views.day.delete' workout.id day.obj.id %}"+ <a href="{% url 'day-delete' day.obj.id %}"title="{% trans 'Delete' %}"><img src="{% static 'images/icons/trash.svg' %}"width="22"diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.pyindex f4e14b2d5..c14b0a8e9 100644--- a/wger/manager/tests/test_day.py+++ b/wger/manager/tests/test_day.py@@ -50,8 +50,7 @@ class DeleteWorkoutDayTestCase(WorkoutManagerTestCase):# Fetch the day edit pagecount_before = Day.objects.count()- response = self.client.get(reverse('wger.manager.views.day.delete', kwargs={'id': 3,- 'day_id': 5}))+ response = self.client.get(reverse('day-delete', kwargs={'pk': 5}))count_after = Day.objects.count()if fail:diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex e64fa84c2..ed677c50a 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -132,7 +132,9 @@ urlpatterns = patterns('wger.manager.views',url(r'^workout/(?P<workout_pk>\d+)/day/add/$',login_required(DayCreateView.as_view()),name='day-add'),- url(r'^workout/(?P<id>\d+)/day/(?P<day_id>\d+)/delete/$', 'day.delete'),+ url(r'^workout/day/(?P<pk>\d+)/delete/$',+ 'day.delete',+ name='day-delete'),url(r'^workout/day/(?P<id>\d+)/view/$', 'day.view'),url(r'^workout/day/(?P<pk>\d+)/log/add/$','log.add',diff --git a/wger/manager/views/day.py b/wger/manager/views/day.pyindex 432a301d3..659395ff1 100644--- a/wger/manager/views/day.py+++ b/wger/manager/views/day.py@@ -115,18 +115,14 @@ class DayCreateView(DayView, CreateView):@login_required-def delete(request, id, day_id):+def delete(request, pk):'''- Deletes the day with ID day_id belonging to workout with ID id+ Deletes the given day'''-- # Load the day- day = get_object_or_404(Day, pk=day_id)-- # Check if the user is the owner of the object- if day.training.user == request.user:+ day = get_object_or_404(Day, pk=pk)+ if day.get_owner_object().user == request.user:day.delete()- return HttpResponseRedirect(reverse('workout-view', kwargs={'id': id}))+ return HttpResponseRedirect(reverse('workout-view', kwargs={'id': day.training_id}))else:return HttpResponseForbidden()