diff --git a/cookbook/serializer.py b/cookbook/serializer.py index fb1c3a224..06d09c216 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -496,6 +496,11 @@ class StepRecipeSerializer(WritableNestedModelSerializer): class NutritionInformationSerializer(serializers.ModelSerializer): + carbohydrates = CustomDecimalField() + fats = CustomDecimalField() + proteins = CustomDecimalField() + calories = CustomDecimalField() + def create(self, validated_data): validated_data['space'] = self.context['request'].space diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue index 09ceb6e07..9b8f081d6 100644 --- a/vue/src/apps/RecipeEditView/RecipeEditView.vue +++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue @@ -586,6 +586,8 @@ export default { if (this.recipe.working_time === "" || isNaN(this.recipe.working_time)) { this.recipe.working_time = 0 } + + this.recipe.servings = Math.floor(this.recipe.servings) // temporary fix until a proper framework for frontend input validation is established if (this.recipe.servings === "" || isNaN(this.recipe.servings)) { this.recipe.servings = 0 }