Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix issue when deleting the last image of an exercise
Roland Geider0251b6f3a1ed
diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex a4425b6a7..bc8702cdf 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -394,10 +394,10 @@ class ExerciseImage(models.Model):if self.is_main:ExerciseImage.objects.filter(exercise=self.exercise).update(is_main=False)self.is_main = True-- # If the exercise has only one image, mark it as main- if not ExerciseImage.objects.filter(exercise=self.exercise, is_main=False).count():- self.is_main = True+ else:+ if ExerciseImage.objects.filter(exercise=self.exercise).count() == 0 \+ or not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count():+ self.is_main = True## Reset all cached infos@@ -428,10 +428,11 @@ class ExerciseImage(models.Model):delete_template_fragment_cache('exercise-detail-muscles', self.exercise.id, language.id)# Make sure there is always a main image- if not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count():- image = ExerciseImage.objects.filter(exercise=self.exercise).filter(is_main=False)[0]- image.is_main = True- image.save()+ if not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count()\+ and ExerciseImage.objects.filter(exercise=self.exercise).filter(is_main=False).count():+ image = ExerciseImage.objects.filter(exercise=self.exercise, is_main=False)[0]+ image.is_main = True+ image.save()def get_owner_object(self):'''diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.pyindex b8d724826..77569b3ec 100644--- a/wger/exercises/tests/test_exercise_images.py+++ b/wger/exercises/tests/test_exercise_images.py@@ -14,6 +14,7 @@from django.core.urlresolvers import reverse+from django.core.files import Filefrom wger.exercises.models import Exercisefrom wger.exercises.models import ExerciseImage@@ -25,6 +26,81 @@ from wger.manager.tests.testcase import WorkoutManagerDeleteTestCasefrom wger.manager.tests.testcase import ApiBaseResourceTestCase+class MainImageTestCase(WorkoutManagerTestCase):+ '''+ Tests the methods to make sure there is always a main image per picture+ '''++ def save_image(self, exercise, filename, db_filename=None):+ '''+ Helper function to save an image to an exercise+ '''+ if not db_filename:+ db_filename = filename+ image = ExerciseImage()+ image.exercise = exercise+ image.image.save(+ filename,+ File(open('wger/exercises/tests/{0}'.format(filename)), 'rb')+ )+ image.save()++ def test_auto_main_image(self):+ '''+ Tests that the first uploaded image is automatically a main image+ '''++ exercise = Exercise.objects.get(pk=2)+ self.save_image(exercise, 'protestschwein.jpg')++ image = ExerciseImage.objects.get(pk=3)+ self.assertTrue(image.is_main)++ def test_auto_main_image_multiple(self):+ '''+ Tests that there is always a main image after deleting one+ '''++ exercise = Exercise.objects.get(pk=2)+ self.save_image(exercise, 'protestschwein.jpg')+ self.save_image(exercise, 'wildschwein.jpg')++ image = ExerciseImage.objects.get(pk=3)+ self.assertTrue(image.is_main)++ image = ExerciseImage.objects.get(pk=4)+ self.assertFalse(image.is_main)++ def test_delete_main_image(self):+ '''+ Tests that there is always a main image after deleting one+ '''++ exercise = Exercise.objects.get(pk=2)+ self.save_image(exercise, 'protestschwein.jpg')+ self.save_image(exercise, 'protestschwein.jpg')+ self.save_image(exercise, 'wildschwein.jpg')+ self.save_image(exercise, 'wildschwein.jpg')+ self.save_image(exercise, 'wildschwein.jpg')++ image = ExerciseImage.objects.get(pk=3)+ 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.assertFalse(ExerciseImage.objects.get(pk=6).is_main)+ self.assertFalse(ExerciseImage.objects.get(pk=7).is_main)++ image = ExerciseImage.objects.get(pk=4)+ 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.assertFalse(ExerciseImage.objects.get(pk=7).is_main)++class AddExerciseImageTestCase(WorkoutManagerAddTestCase):'''Tests adding an image to an exercise