Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix problem with optional URL parameters

Rolandaa17e2102d24
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 88b337734..19b4a9242 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -129,7 +129,7 @@ patterns_session = [
url(r'^(?P<pk>\d+)/edit$',
workout_session.WorkoutSessionUpdateView.as_view(),
name='edit'),
- url(r'^(?P<pk>\d+)/delete/(?P<logs>(session|logs))?$',
+ url(r'^(?P<pk>\d+)/delete/(?P<logs>session|logs)?$',
workout_session.WorkoutSessionDeleteView.as_view(),
name='delete'),
]
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index f2f1cc541..544fcba0b 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -149,18 +149,18 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
'''
Delete the workout session and, if wished, all associated weight logs as well
'''
- if self.kwargs['logs'] == 'logs':
+ if self.kwargs.get('logs') == 'logs':
WorkoutLog.objects.filter(user=self.request.user, date=self.get_object().date).delete()
return super(WorkoutSessionDeleteView, self).delete(request, *args, **kwargs)
def get_context_data(self, **kwargs):
- logs = '' if not self.kwargs['logs'] else self.kwargs['logs']
+ logs = '' if not self.kwargs.get('logs') else self.kwargs['logs']
context = super(WorkoutSessionDeleteView, self).get_context_data(**kwargs)
context['form_action'] = reverse('manager:session:delete', kwargs={'pk': self.object.id,
'logs': logs})
context['title'] = _(u'Delete {0}?').format(self.object)
- if self.kwargs['logs'] == 'logs':
+ if logs == 'logs':
context['delete_message'] = _('This will delete all weight logs for this day as well.')
return context