Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add form helper to workout copy form
Roland Geider43af2cff5db2
diff --git a/requirements.txt b/requirements.txtindex 3b7898a32..8f9326ea5 100644--- a/requirements.txt+++ b/requirements.txt@@ -7,7 +7,7 @@ bleach~=3.3django-bootstrap-breadcrumbs~=0.9django-formtools~=2.2django-recaptcha==2.0.6-Django~=3.1+Django~=3.1.8django-crispy-forms~=1.11django_compressor~=2.4django_extensions~=3.1diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.pyindex 305df80cc..f1a55550f 100644--- a/wger/manager/tests/test_copy_workout.py+++ b/wger/manager/tests/test_copy_workout.py@@ -46,8 +46,8 @@ class CopyWorkoutTestCase(WgerTestCase):# Copy the workoutcount_before = Workout.objects.count()- response = self.client.post(reverse('manager:workout:copy', kwargs={'pk': '3'}),- {'comment': 'A copied workout'})+ self.client.post(reverse('manager:workout:copy', kwargs={'pk': '3'}),+ {'comment': 'A copied workout'})count_after = Workout.objects.count()if not owner:@@ -55,7 +55,6 @@ class CopyWorkoutTestCase(WgerTestCase):else:self.assertGreater(count_after, count_before)self.assertEqual(count_after, 4)-self.assertTemplateUsed('workout/view.html')# Test accessing the copied workout@@ -66,14 +65,14 @@ class CopyWorkoutTestCase(WgerTestCase):else:self.assertEqual(response.status_code, 200)- original = Workout.objects.get(pk=3)- copy = Workout.objects.get(pk=4)+ workout_original = Workout.objects.get(pk=3)+ workout_copy = Workout.objects.get(pk=4)- days_original = original.day_set.all()- days_copy = copy.day_set.all()+ days_original = workout_original.day_set.all()+ days_copy = workout_copy.day_set.all()# Test that the different attributes and objects are correctly copied over- for i in range(0, original.day_set.count()):+ for i in range(0, workout_original.day_set.count()):self.assertEqual(days_original[i].description, days_copy[i].description)for j in range(0, days_original[i].day.count()):diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 8c7735cd7..32d34d6d5 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -35,6 +35,7 @@ from django.urls import (reverse,reverse_lazy)+from django.utils.text import slugifyfrom django.utils.translation import (ugettext as _,ugettext_lazy@@ -44,6 +45,10 @@ from django.views.generic import (UpdateView)+# Third Party+from crispy_forms.helper import FormHelper+from crispy_forms.layout import Submit+# wgerfrom wger.core.models import (RepetitionUnit,@@ -136,7 +141,7 @@ def copy_workout(request, pk):if workout_form.is_valid():# Copy workout- days = workout.day_set.all()+ days_original = workout.day_set.all()workout_copy = workoutworkout_copy.pk = None@@ -145,7 +150,7 @@ def copy_workout(request, pk):workout_copy.save()# Copy the days- for day in days:+ for day in days_original:sets = day.set_set.all()day_copy = day@@ -182,6 +187,13 @@ def copy_workout(request, pk):kwargs={'pk': workout.id}))else:workout_form = WorkoutCopyForm({'comment': workout.comment})+ workout_form.helper = FormHelper()+ workout_form.helper.form_id = slugify(request.path)+ workout_form.helper.form_method = 'post'+ workout_form.helper.form_action = request.path+ workout_form.helper.add_input(+ Submit('submit', _('Save'), css_class='btn-success btn-block'))+ workout_form.helper.form_class = 'wger-form'template_data = {}template_data.update(csrf(request))