Self hosted FLOSS fitness/workout, nutrition and weight tracker
Return the same REST structure with the new exercise base
Roland Geider0a0226e52721
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex e033cd5e6..eb9045182 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -38,15 +38,6 @@ class ExerciseBaseSerializer(serializers.ModelSerializer):fields = '__all__'-class ExerciseSerializer(serializers.ModelSerializer):- """- Exercise serializer- """- class Meta:- model = Exercise- fields = '__all__'--class EquipmentSerializer(serializers.ModelSerializer):"""Equipment serializer@@ -74,14 +65,70 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):fields = '__all__'+class ExerciseCategorySerializer(serializers.ModelSerializer):+ """+ ExerciseCategory serializer+ """+ class Meta:+ model = ExerciseCategory+ fields = '__all__'+++class MuscleSerializer(serializers.ModelSerializer):+ """+ Muscle serializer+ """+ class Meta:+ model = Muscle+ fields = '__all__'+++class ExerciseSerializer(serializers.ModelSerializer):+ """+ Exercise serializer++ The fields from the new ExerciseBase are retrieved here as to retain+ compatibility with the old model where all the fields where in Exercise.+ """+ category = serializers.PrimaryKeyRelatedField(source='exercise_base.category',+ read_only=True)+ muscles = serializers.PrimaryKeyRelatedField(source='exercise_base.muscles',+ many=True,+ read_only=True)+ muscles_secondary = serializers.PrimaryKeyRelatedField(source='exercise_base.muscles_secondary',+ many=True,+ read_only=True)+ equipment = serializers.PrimaryKeyRelatedField(source='exercise_base.equipment',+ many=True,+ read_only=True)++ class Meta:+ model = Exercise+ fields = ("id",+ "uuid",+ "name",+ "description",+ "creation_date",+ "category",+ "muscles",+ "muscles_secondary",+ "equipment",+ "language",+ "license",+ "license_author")++class ExerciseInfoSerializer(serializers.ModelSerializer):"""- Equipment serializer+ Exercise info serializer"""images = ExerciseImageSerializer(source='exerciseimage_set', many=True)comments = ExerciseCommentSerializer(source='exercisecomment_set', many=True)- exercise_base = ExerciseBaseSerializer(source='exercisebase_set', many=True)+ category = ExerciseCategorySerializer(source='exercise_base.category')+ muscles = MuscleSerializer(source='exercise_base.muscles', many=True)+ muscles_secondary = MuscleSerializer(source='exercise_base.muscles_secondary', many=True)+ equipment = EquipmentSerializer(source='exercise_base.equipment', many=True)class Meta:model = Exercise@@ -91,28 +138,13 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):"uuid","description","creation_date",- "exercise_base"+ "category",+ "muscles",+ "muscles_secondary",+ "equipment","language","license","license_author","images","variations","comments")---class ExerciseCategorySerializer(serializers.ModelSerializer):- """- ExerciseCategory serializer- """- class Meta:- model = ExerciseCategory- fields = '__all__'---class MuscleSerializer(serializers.ModelSerializer):- """- Muscle serializer- """- class Meta:- model = Muscle- fields = '__all__'diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex efafcbe3b..1bdd9842c 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -250,7 +250,7 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):"""Variations of this exercise"""exercise_base = models.ForeignKey(ExerciseBase,- verbose_name=('ExerciseBase'),+ verbose_name='ExerciseBase',on_delete=models.CASCADE,default=None,null=True,