cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

recipe editor decimal fixes

Browse Source
This commit is contained in:
vabene1111
2022-01-17 16:27:10 +01:00
parent a19ad706ce
commit 306f90aa98
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/serializer.py
View File

@ -496,6 +496,11 @@ class StepRecipeSerializer(WritableNestedModelSerializer):
class NutritionInformationSerializer(serializers.ModelSerializer): class NutritionInformationSerializer(serializers.ModelSerializer):
carbohydrates = CustomDecimalField()
fats = CustomDecimalField()
proteins = CustomDecimalField()
calories = CustomDecimalField()
def create(self, validated_data): def create(self, validated_data):
validated_data['space'] = self.context['request'].space validated_data['space'] = self.context['request'].space

2
vue/src/apps/RecipeEditView/RecipeEditView.vue
View File

@ -586,6 +586,8 @@ export default {
if (this.recipe.working_time === "" || isNaN(this.recipe.working_time)) { if (this.recipe.working_time === "" || isNaN(this.recipe.working_time)) {
this.recipe.working_time = 0 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)) { if (this.recipe.servings === "" || isNaN(this.recipe.servings)) {
this.recipe.servings = 0 this.recipe.servings = 0
} }