Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix some issues with the exercises' main image

Roland Geiderb61caf1fc35e
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 84a8ce14c..fce4ac68b 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -83,8 +83,8 @@ def search(request):
.distinct())
for exercise in exercises:
- if exercise.exerciseimage_set.exists():
- image_obj = exercise.exerciseimage_set.filter(is_main=True)[0]
+ if exercise.main_image:
+ image_obj = exercise.main_image
image = image_obj.image.url
t = get_thumbnailer(image_obj.image)
thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 0fe6e6912..4191c8c27 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -276,11 +276,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''
Return the main image for the exercise or None if nothing is found
'''
- has_image = self.exerciseimage_set.exists()
- image = None
- if has_image:
- image = self.exerciseimage_set.filter(is_main=True)[0]
- return image
+ return self.exerciseimage_set.accepted().filter(is_main=True).first()
def get_owner_object(self):
'''
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index ea9d73ccb..b9571ce2c 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -54,7 +54,7 @@ class MainImageTestCase(WorkoutManagerTestCase):
exercise = Exercise.objects.get(pk=2)
self.save_image(exercise, 'protestschwein.jpg')
- image = ExerciseImage.objects.get(pk=3)
+ image = ExerciseImage.objects.get(pk=4)
self.assertTrue(image.is_main)
def test_auto_main_image_multiple(self):
@@ -66,10 +66,10 @@ class MainImageTestCase(WorkoutManagerTestCase):
self.save_image(exercise, 'protestschwein.jpg')
self.save_image(exercise, 'wildschwein.jpg')
- image = ExerciseImage.objects.get(pk=3)
+ image = ExerciseImage.objects.get(pk=4)
self.assertTrue(image.is_main)
- image = ExerciseImage.objects.get(pk=4)
+ image = ExerciseImage.objects.get(pk=5)
self.assertFalse(image.is_main)
def test_delete_main_image(self):
@@ -84,22 +84,22 @@ class MainImageTestCase(WorkoutManagerTestCase):
self.save_image(exercise, 'wildschwein.jpg')
self.save_image(exercise, 'wildschwein.jpg')
- image = ExerciseImage.objects.get(pk=3)
+ image = ExerciseImage.objects.get(pk=4)
self.assertTrue(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=4).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=5).is_main)
+ self.assertTrue(ExerciseImage.objects.get(pk=5).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=6).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=7).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=8).is_main)
- image = ExerciseImage.objects.get(pk=4)
+ image = ExerciseImage.objects.get(pk=5)
self.assertTrue(image.is_main)
image.delete()
- self.assertTrue(ExerciseImage.objects.get(pk=5).is_main)
- self.assertFalse(ExerciseImage.objects.get(pk=6).is_main)
+ self.assertTrue(ExerciseImage.objects.get(pk=6).is_main)
self.assertFalse(ExerciseImage.objects.get(pk=7).is_main)
+ self.assertFalse(ExerciseImage.objects.get(pk=8).is_main)
class AddExerciseImageTestCase(WorkoutManagerAddTestCase):