Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix bug that prevented editing sets
Roland Geidere665b4a87936
diff --git a/docs/changelog.rst b/docs/changelog.rstindex 8470ab55c..7913d513f 100644--- a/docs/changelog.rst+++ b/docs/changelog.rst@@ -49,7 +49,7 @@ Upgrade steps from 1.9:* `#368`_, `#379`_, `#426`_ (thanks `@austin-leung`_), `#499`_, `#505`_, `#504`_,`#511`_, `#516`_, `#522`_, `#554`_ and `#560`_ (thanks `@sandilsranasinghe`_),`#564`_, `#565`_, `#615`_, `#560`_ (thanks `@bradsk88`_), `#617`_ (thanks `@Sidrah-Madiha`_),- `#636`_, `#640`_, `#642`_+ `#636`_, `#640`_, `#642`_, `#648`_🧰 Maintenance:@@ -125,6 +125,7 @@ Upgrade steps from 1.9:.. _#636: https://github.com/wger-project/wger/issues/636.. _#640: https://github.com/wger-project/wger/issues/640.. _#642: https://github.com/wger-project/wger/issues/642+.. _#648: https://github.com/wger-project/wger/issues/648diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex 7f1759bdb..578bdd803 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -157,6 +157,7 @@ class WorkoutLogFormHelper(FormHelper):super().__init__(*args, **kwargs)self.form_method = 'post'self.layout = Layout(+ 'id',Row(Column('reps', css_class='form-group col-2 mb-0'),Column('repetition_unit', css_class='form-group col-3 mb-0'),diff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 6ca0e270a..f9706abd9 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -19,7 +19,6 @@ import logging# Djangofrom django.contrib.auth.decorators import login_required-from django.core.exceptions import ObjectDoesNotExistfrom django.db import modelsfrom django.forms.models import (inlineformset_factory,@@ -174,17 +173,24 @@ def edit(request, pk):if set_obj.get_owner_object().user != request.user:return HttpResponseForbidden()+ SettingFormsetEdit = modelformset_factory(Setting,+ form=SettingForm,+ fields=SETTING_FORMSET_FIELDS + ('id',),+ can_delete=False,+ can_order=True,+ extra=0)+formsets = []for exercise in set_obj.exercises:queryset = Setting.objects.filter(set=set_obj, exercise=exercise)- formset = SettingFormset(queryset=queryset, prefix='exercise{0}'.format(exercise.id))+ formset = SettingFormsetEdit(queryset=queryset, prefix='exercise{0}'.format(exercise.id))formsets.append({'exercise': exercise, 'formset': formset})if request.method == "POST":formsets = []for exercise in set_obj.exercises:- formset = SettingFormset(request.POST,- prefix='exercise{0}'.format(exercise.id))+ formset = SettingFormsetEdit(request.POST,+ prefix='exercise{0}'.format(exercise.id))formsets.append({'exercise': exercise, 'formset': formset})# If all formsets validate, save them@@ -196,29 +202,16 @@ def edit(request, pk):if all_valid:for formset in formsets:instances = formset['formset'].save(commit=False)- for instance in instances:- # If the setting has already a set, we are editing...- try:- instance.set-- # Check that we are allowed to do this- if instance.get_owner_object().user != request.user:- return HttpResponseForbidden()-- instance.save()- # ...if not, create a new setting- except ObjectDoesNotExist:- instance.set = set_obj- instance.order = 1- instance.exercise = formset['exercise']- instance.save()+ for instance in instances:+ # Double check that we are allowed to edit the set+ if instance.get_owner_object().user != request.user:+ return HttpResponseForbidden()+ instance.save()return HttpResponseRedirect(reverse('manager:workout:view',kwargs={'pk': set_obj.get_owner_object().id}))# Other context we need- context = {}- context['formsets'] = formsets- context['helper'] = WorkoutLogFormHelper()+ context = {'formsets': formsets, 'helper': WorkoutLogFormHelper()}return render(request, 'set/edit.html', context)