Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix placement of image list key
Roland Geider37a2010ad2b8
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 7891317a3..94b3188c9 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -159,7 +159,6 @@ class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):"""obj = SetSerializer()exercise_list = WorkoutCanonicalFormExerciseListSerializer(many=True)- #exercise_image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)has_settings = serializers.BooleanField()is_superset = serializers.BooleanField()muscles = MusclesCanonicalFormSerializer()diff --git a/wger/manager/models.py b/wger/manager/models.pyindex a99aae625..dcac82393 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -532,7 +532,6 @@ class Day(models.Model):canonical_repr.append({'obj': set_obj,'exercise_list': exercise_tmp,- 'exercise_image_list': exercise_images_tmp,'is_superset': True if len(exercise_tmp) > 1 else False,'has_settings': has_setting_tmp,'muscles': {diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.pyindex fcb46897b..608083f8a 100644--- a/wger/manager/tests/test_workout_canonical.py+++ b/wger/manager/tests/test_workout_canonical.py@@ -56,6 +56,8 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit = WeightUnit.objects.get(pk=1)muscle1 = Muscle.objects.get(pk=1)muscle2 = Muscle.objects.get(pk=2)+ image1 = '/media/exercise-images/1/protestschwein.jpg'+ image2 = '/media/exercise-images/1/wildschwein.jpg'self.assertEqual(workout.canonical_representation['muscles'],{'back': [muscle2],'frontsecondary': [muscle1],@@ -71,6 +73,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'front': [muscle1]},'obj': Day.objects.get(pk=1),'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1),+ 'image_list': [+ {'image': image1, 'is_main': True},+ {'image': image2, 'is_main': False}],'comment_list': ['test 123'],'has_weight': False,'setting_list': ['8', '8'],@@ -82,9 +87,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):repetition_unit],'weight_units': [weight_unit,weight_unit]}],- 'exercise_image_list': [{- 'image': '/media/exercise-images/1/protestschwein.jpg',- 'is_main': True}],+'is_superset': False,'has_settings': True,'muscles': {'back': [muscle2],@@ -99,8 +102,6 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):self.assertEqual(days_test_data['obj'], canonical_form['obj'])self.assertEqual(days_test_data['set_list'][0]['exercise_list'],canonical_form['set_list'][0]['exercise_list'])- self.assertEqual(days_test_data['set_list'][0]['exercise_image_list'][0],- canonical_form['set_list'][0]['exercise_image_list'][0])self.assertEqual(days_test_data['set_list'][0]['is_superset'],canonical_form['set_list'][0]['is_superset'])self.assertEqual(days_test_data['set_list'][0]['has_settings'],@@ -117,6 +118,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):'backsecondary': [muscle1],'front': []},'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),+ 'image_list': [{+ 'image': image2,+ 'is_main': False}],'comment_list': ['Foobar'],'has_weight': True,'reps_list': [10, 10, 10, 10],@@ -135,9 +139,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit,weight_unit,weight_unit]}],- 'exercise_image_list': [{- 'image': '/media/exercise-images/1/wildschwein.jpg',- 'is_main': False}],+'is_superset': False,'has_settings': True,'muscles': {'back': [muscle2],@@ -151,8 +153,6 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):self.assertEqual(days_test_data['obj'], canonical_form['obj'])self.assertEqual(days_test_data['set_list'][0]['exercise_list'],canonical_form['set_list'][0]['exercise_list'])- self.assertEqual(days_test_data['set_list'][0]['exercise_image_list'][0],- canonical_form['set_list'][0]['exercise_image_list'][0])self.assertEqual(days_test_data['set_list'][0]['is_superset'],canonical_form['set_list'][0]['is_superset'])self.assertEqual(days_test_data['set_list'][0]['has_settings'],@@ -183,6 +183,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit = WeightUnit.objects.get(pk=1)muscle1 = Muscle.objects.get(pk=1)muscle2 = Muscle.objects.get(pk=2)+ image2 = '/media/exercise-images/1/wildschwein.jpg'self.assertEqual(day.canonical_representation['days_of_week'],{'day_list': [weekday1, weekday2], 'text': 'Wednesday, Friday'})self.assertEqual(day.canonical_representation['muscles'],@@ -193,6 +194,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):self.assertEqual(day.canonical_representation['obj'], day)canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2),+ 'image_list': [{+ 'image': image2,+ 'is_main': False}],'comment_list': ['Foobar'],'reps_list': [10, 10, 10, 10],'has_weight': False,@@ -208,9 +212,6 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):weight_unit,weight_unit,weight_unit]}],- 'exercise_image_list': [- {'image': '/media/exercise-images/1/wildschwein.jpg',- 'is_main': False}],'is_superset': False,'has_settings': True,'muscles': {'back': [muscle2],