Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use correct serializer for canonical form

Roland Geider33e2ad67c778
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index c08c8b10e..9f31e56a5 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -22,7 +22,7 @@ from rest_framework import serializers
from wger.core.api.serializers import DaysOfWeekSerializer
from wger.exercises.api.serializers import (
ExerciseSerializer,
- MuscleSerializer,
+ MuscleSerializer, ExerciseBaseInfoSerializer,
)
from wger.manager.models import (
Day,
@@ -183,7 +183,7 @@ class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer):
weight_list = serializers.ReadOnlyField()
comment_list = serializers.ReadOnlyField()
image_list = WorkoutCanonicalFormExerciseImagesListSerializer(many=True)
- obj = ExerciseSerializer()
+ obj = ExerciseBaseInfoSerializer()
class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer):
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 842cb68df..e344424c3 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -89,7 +89,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'is_main': False
}
],
- 'comment_list': ['test 123'],
+ 'comment_list': [],
'has_weight':
False,
'setting_obj_list': [setting_1],
@@ -143,7 +143,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'image': image2,
'is_main': False
}],
- 'comment_list': ['Foobar'],
+ 'comment_list': [],
'has_weight': True,
'setting_obj_list': [setting_2],
'setting_text': '4 \xd7 10 (15 kg)',
@@ -225,7 +225,7 @@ class WorkoutCanonicalFormTestCase(WgerTestCase):
'image': image2,
'is_main': False
}],
- 'comment_list': ['Foobar'],
+ 'comment_list': [],
'has_weight': False,
'setting_obj_list': [Setting.objects.get(pk=3)],
'setting_text': '4 \xd7 10',