Self hosted FLOSS fitness/workout, nutrition and weight tracker
Output the weight unit as a primary key as well
Roland Geidere39c202cc7fc
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.pyindex 1a5a28371..d2e7cb0b9 100644--- a/wger/core/templatetags/wger_extras.py+++ b/wger/core/templatetags/wger_extras.py@@ -22,8 +22,8 @@ from django.templatetags.static import staticfrom django.utils.html import strip_spaces_between_tagsfrom django.utils.safestring import mark_safefrom django.utils.translation import (- pgettext,- gettext_lazy as _+ gettext_lazy as _,+ pgettext)# wgerdiff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex f91963f25..f05f6d9c5 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -160,15 +160,18 @@ class MealItemInfoSerializer(serializers.ModelSerializer):meal = serializers.PrimaryKeyRelatedField(read_only=True)ingredient = serializers.PrimaryKeyRelatedField(read_only=True)ingredient_obj = IngredientInfoSerializer(source='ingredient', read_only=True)+ weight_unit = serializers.PrimaryKeyRelatedField(read_only=True)+ weight_unit_obj = IngredientWeightUnitSerializer(source='weight_unit', read_only=True)class Meta:model = MealItemdepth = 1fields = ['id','meal',- 'ingredient_obj','ingredient',+ 'ingredient_obj','weight_unit',+ 'weight_unit_obj','order','amount']