Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add option to delete workout sessions
Roland Geiderb00ca59eb0ef
diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.htmlindex a67f35e0b..694ca57bd 100644--- a/wger/manager/templates/calendar/partial_overview_table.html+++ b/wger/manager/templates/calendar/partial_overview_table.html@@ -12,7 +12,26 @@{% if is_owner %}<div class="col-sm-4">{% if value.session %}- <a href="{% url 'manager:session:edit' value.session.pk %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>+ <div class="btn-group" role="group">+ <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ {% trans "Workout session" %}+ <span class="caret"></span>+ </button>+ <ul class="dropdown-menu">+ <li>+ <a href="{% url 'manager:session:edit' value.session.pk %}" class="wger-modal-dialog">+ <span class="glyphicon glyphicon-pencil"></span>+ {% trans "Edit" %}+ </a>+ </li>+ <li>+ <a href="{% url 'manager:session:delete' value.session.pk %}" class="wger-modal-dialog">+ <span class="glyphicon glyphicon-trash"></span>+ {% trans "Delete" %}+ </a>+ </li>+ </ul>+ </div>{% else %}<a href="{% url 'manager:session:add' value.workout.id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>{% endif %}diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex 60788ed02..4c388cb7e 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -21,7 +21,7 @@ from django.core.urlresolvers import reverse, reverse_lazyfrom wger.core.tests import api_base_testfrom wger.manager.models import Workout, WorkoutSession-from wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.manager.tests.testcase import WorkoutManagerTestCase, WorkoutManagerDeleteTestCasefrom wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.manager.tests.testcase import WorkoutManagerEditTestCasefrom wger.utils.cache import cache_mapper, get_template_cache_name@@ -89,6 +89,16 @@ class WorkoutSessionModelTestCase(WorkoutManagerTestCase):u'{0} - {1}'.format(Workout.objects.get(pk=1), datetime.date.today()))+class DeleteTestWorkoutTestCase(WorkoutManagerDeleteTestCase):+ '''+ Tests deleting a Workout+ '''++ object_class = WorkoutSession+ url = 'manager:session:delete'+ pk = 3++class WorkoutSessionTestCase(WorkoutManagerTestCase):'''Tests other workout session methodsdiff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex d57413446..5245425ee 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -112,6 +112,9 @@ patterns_session = patterns('',url(r'^(?P<pk>\d+)/edit$',workout_session.WorkoutSessionUpdateView.as_view(),name='edit'),+ url(r'^(?P<pk>\d+)/delete$',+ workout_session.WorkoutSessionDeleteView.as_view(),+ name='delete'),)diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pyindex 1283e7041..ed5f44b35 100644--- a/wger/manager/views/workout_session.py+++ b/wger/manager/views/workout_session.py@@ -19,16 +19,16 @@ import datetimefrom django.http import HttpResponseForbiddenfrom django.http import HttpResponseBadRequest-from django.core.urlresolvers import reverse-from django.utils.translation import ugettext as _+from django.core.urlresolvers import reverse, reverse_lazy+from django.utils.translation import ugettext as _, ugettext_lazy-from django.views.generic import UpdateView+from django.views.generic import UpdateView, DeleteViewfrom django.views.generic import CreateViewfrom wger.manager.forms import WorkoutSessionFormfrom wger.manager.models import Workout, WorkoutSession-from wger.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixinfrom wger.utils.generic_views import WgerPermissionMixin@@ -116,3 +116,20 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):form.instance.user = self.request.userform.instance.date = self.get_date()return super(WorkoutSessionAddView, self).form_valid(form)+++class WorkoutSessionDeleteView(WgerDeleteMixin, DeleteView):+ '''+ Generic view to delete a workout routine+ '''++ model = WorkoutSession+ success_url = reverse_lazy('manager:workout:overview')+ messages = ugettext_lazy('Successfully deleted')+ login_required = True++ def get_context_data(self, **kwargs):+ context = super(WorkoutSessionDeleteView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('manager:session:delete', kwargs={'pk': self.object.id})+ context['title'] = _(u'Delete {0}?').format(self.object)+ return contextdiff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.htmlindex ff04a0b74..d53203149 100644--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@ -42,6 +42,10 @@Reduce size of generated html code<a href="https://github.com/rolandgeider/wger/issues/125">#125</a></li>+ <li>+ Add option to delete workout sessions and their logs+ <a href="https://github.com/rolandgeider/wger/issues/156">#156</a>+ </li><li>Improve installation, development and maintenance documentation<a href="https://github.com/rolandgeider/wger/issues/114">#114</a>