Self hosted FLOSS fitness/workout, nutrition and weight tracker
setup views and test for weigh-entry delete option
beingbiplovb09db07071e6
diff --git a/wger/weight/templates/overview.html b/wger/weight/templates/overview.htmlindex c3a1e13a2..56202f8c9 100644--- a/wger/weight/templates/overview.html+++ b/wger/weight/templates/overview.html@@ -84,6 +84,11 @@<span class="{% fa_class 'edit' %}"></span>{% trans "Edit weight" %}</a>+ <div class="dropdown-divider"></div>+ <a href="{% url 'weight:delete' entry_detail.0.id %}" class="dropdown-item wger-modal-dialog">+ <span class="{% fa_class 'trash' %}"></span>+ {% trans "Delete" %}+ </a></div></div></div>diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex c622147d1..ec087f8a5 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -24,7 +24,8 @@ from wger.core.tests import api_base_testfrom wger.core.tests.base_testcase import (WgerAddTestCase,WgerEditTestCase,- WgerTestCase+ WgerTestCase,+ WgerDeleteTestCase)from wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntry@@ -112,6 +113,18 @@ class EditWeightEntryTestCase(WgerEditTestCase):user_fail = 'admin'+class DeleteWeightEntryTestCase(WgerDeleteTestCase):+ """+ Tests deleting a weight entry+ """++ object_class = WeightEntry+ url = 'weight:delete'+ pk = 1+ user_success = 'test'+ user_fail = 'admin'++class WeightEntryTestCase(api_base_test.ApiBaseResourceTestCase):"""Tests the weight entry overview resourcediff --git a/wger/weight/urls.py b/wger/weight/urls.pyindex a6a288b92..2e9b99075 100644--- a/wger/weight/urls.py+++ b/wger/weight/urls.py@@ -33,6 +33,10 @@ urlpatterns = [login_required(views.WeightUpdateView.as_view()),name='edit'),+ url(r'^(?P<pk>\d+)/delete/$',+ views.WeightDeleteView.as_view(),+ name='delete'),+url(r'^export-csv/$',views.export_csv,name='export-csv'),diff --git a/wger/weight/views.py b/wger/weight/views.pyindex c34ff56dd..39eb90a9e 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -38,7 +38,8 @@ from django.utils.translation import ()from django.views.generic import (CreateView,- UpdateView+ UpdateView,+ DeleteView)# Third Party@@ -47,7 +48,10 @@ from rest_framework.decorators import api_viewfrom rest_framework.response import Response# wger-from wger.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import (+ WgerFormMixin,+ WgerDeleteMixin+)from wger.utils.helpers import check_accessfrom wger.weight import helpersfrom wger.weight.forms import WeightForm@@ -109,6 +113,28 @@ class WeightUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):return reverse('weight:overview', kwargs={'username': self.object.user.username})+class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):+ """+ Generic view to delete a weight entry+ """++ model = WeightEntry+ fields = ('weight',)++ messages = ugettext_lazy('Successfully deleted.')++ def get_context_data(self, **kwargs):+ context = super(WeightDeleteView, self).get_context_data(**kwargs)+ context['title'] = _('Delete weight entry for the %s') % self.object.date+ return context++ def get_success_url(self):+ """+ Return to overview with username+ """+ return reverse('weight:overview', kwargs={'username': self.object.user.username})++@login_requireddef export_csv(request):"""