Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix clean method for ingredients
Roland Geidera90caab4e249
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 058a849f1..8b4f84f80 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -321,7 +321,7 @@ class Ingredient(models.Model):# Note: calculations in 100 grams, to save us the '/100' everywhereenergy_protein = 0if self.protein:- self.protein * PROTEIN_FACTOR+ energy_protein = self.protein * PROTEIN_FACTORenergy_carbohydrates = 0if self.carbohydrates:diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.pyindex 44a1ec82d..6e4d914c8 100644--- a/wger/nutrition/tests/test_ingredient.py+++ b/wger/nutrition/tests/test_ingredient.py@@ -361,9 +361,9 @@ class IngredientTestCase(WorkoutManagerTestCase):ingredient = Ingredient()ingredient.name = 'FooBar, cooked, with salt'ingredient.energy = 50- ingredient.protein = '0.5'+ ingredient.protein = 0.5ingredient.carbohydrates = 12- ingredient.fat = '0.1'+ ingredient.fat = 0.1ingredient.language_id = 1self.assertFalse(ingredient.full_clean())@@ -371,11 +371,11 @@ class IngredientTestCase(WorkoutManagerTestCase):ingredient.protein = 20self.assertRaises(ValidationError, ingredient.full_clean)- ingredient.protein = '0.5'+ ingredient.protein = 0.5ingredient.fat = 5self.assertRaises(ValidationError, ingredient.full_clean)- ingredient.fat = '0.1'+ ingredient.fat = 0.1ingredient.carbohydrates = 20self.assertRaises(ValidationError, ingredient.full_clean)