Self hosted FLOSS fitness/workout, nutrition and weight tracker
Also move the images to the exercise base
Roland Geidera3befe2646d9
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex db2a9afda..0f986cc05 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -132,8 +132,8 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):Exercise info serializer"""- images = ExerciseImageSerializer(source='exerciseimage_set', many=True)- comments = ExerciseCommentSerializer(source='exercisecomment_set', many=True)+ images = ExerciseImageSerializer(many=True, read_only=True)+ comments = ExerciseCommentSerializer(source='exercisecomment_set', many=True, read_only=True)category = ExerciseCategorySerializer(read_only=True)muscles = MuscleSerializer(many=True, read_only=True)muscles_secondary = MuscleSerializer(many=True, read_only=True)diff --git a/wger/exercises/migrations/0008_exercisebase.py b/wger/exercises/migrations/0008_exercisebase.pyindex ac9c9fa32..abf7a0b64 100644--- a/wger/exercises/migrations/0008_exercisebase.py+++ b/wger/exercises/migrations/0008_exercisebase.py@@ -58,4 +58,10 @@ class Migration(migrations.Migration):related_name='exercises', to='exercises.exercisebase',verbose_name='ExerciseBase'),),+ migrations.AlterField(+ model_name='exerciseimage',+ name='exercise',+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE,+ to='exercises.exercisebase', verbose_name='Exercise'),+ ),]diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 710b28564..5dfc434e7 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -348,6 +348,10 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):def equipment(self):return self.exercise_base.equipment+ @property+ def images(self):+ return self.exercise_base.exerciseimage_set+## Own methods#@@ -368,7 +372,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):"""Return the main image for the exercise or None if nothing is found"""- return self.exerciseimage_set.accepted().filter(is_main=True).first()+ return self.images.accepted().filter(is_main=True).first()@propertydef description_clean(self):@@ -444,7 +448,7 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)objects = SubmissionManager()"""Custom manager"""- exercise = models.ForeignKey(Exercise,+ exercise = models.ForeignKey(ExerciseBase,verbose_name=_('Exercise'),on_delete=models.CASCADE)"""The exercise the image belongs to"""diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 04e5cd94f..f5b84fcf5 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -11,7 +11,7 @@<meta property="og:description" content="{{ exercise.description_clean }}">{% endblock %}{% block opengraphimages %}- {% for image in exercise.exerciseimage_set.accepted %}+ {% for image in exercise.images.accepted %}<meta property="og:image" content="{{ image.image.url }}">{% empty %}<meta property="og:image" content="{{ image_absolute_path }}">@@ -91,7 +91,7 @@ $(document).ready(function() {{# Images #}-{% with images=exercise.exerciseimage_set.accepted %}+{% with images=exercise.images.accepted %}{% if images or perms.exercises.change_exerciseimage %}<h5 class="mt-4">{% trans "Images" %}:</h5><div class="row row-cols-2 row-cols-md-3">@@ -142,7 +142,7 @@ $(document).ready(function() {{% endwith %}{% if perms.exercises.change_exerciseimage %}-{% with images=exercise.exerciseimage_set.pending %}+{% with images=exercise.images.pending %}{% if images %}<h5 class="mt-4">{% trans "Images pending review" %}</h5><div class="card-deck">diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex fb28ad88c..acfb93a6e 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -42,14 +42,14 @@ class MainImageTestCase(WgerTestCase):if not db_filename:db_filename = filenameimage = ExerciseImage()- image.exercise = exercise+ image.exercise = exercise.exercise_baseimage.status = ExerciseImage.STATUS_ACCEPTEDimage.image.save(filename,File(inFile))image.save()- return(image.pk)+ return image.pkdef test_auto_main_image(self):"""diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.pyindex a25a72bb8..b440233f7 100644--- a/wger/exercises/views/images.py+++ b/wger/exercises/views/images.py@@ -92,12 +92,14 @@ class ExerciseImageAddView(WgerFormMixin,form_class = ExerciseImageFormdef form_valid(self, form):- form.instance.exercise = Exercise.objects.get(pk=self.kwargs['exercise_pk'])+ """Set the exercise base and the author"""+ exercise = get_object_or_404(Exercise, pk=self.kwargs['exercise_pk'])+ form.instance.exercise = exercise.exercise_baseform.instance.set_author(self.request)return super(ExerciseImageAddView, self).form_valid(form)def get_success_url(self):- return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})+ return reverse('exercise:exercise:view', kwargs={'id': self.kwargs['exercise_pk']})def get_context_data(self, **kwargs):"""@@ -147,7 +149,7 @@ def accept(request, pk):image.save()# image.send_email(request)- return HttpResponseRedirect(image.exercise.get_absolute_url())+ return HttpResponseRedirect(reverse('exercise:exercise:overview'))@permission_required('exercises.change_exerciseimage')@@ -160,4 +162,4 @@ def decline(request, pk):image.save()# image.send_email(request)- return HttpResponseRedirect(image.exercise.get_absolute_url())+ return HttpResponseRedirect(reverse('exercise:exercise:overview'))diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 110c81172..f3355944a 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -504,7 +504,7 @@ class Day(models.Model):break# Collect exercise images- for image in exercise.exerciseimage_set.all():+ for image in exercise.images.all():exercise_images_tmp.append({'image': image.image.url,'is_main': image.is_main,})