2martens/food-planner
1
0
Fork 0
generated from 2martens/django-template
Code Issues Pull Requests Releases Wiki Activity

Renamed UsedIngredients to UsedIngredient

Browse Source
This commit is contained in:
Jim Martens
2020-02-19 13:09:25 +01:00
parent 0d1141a0a3
commit 0b3b344669
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
food_planner/migrations/0001_initial.py
View File

@ -66,7 +66,7 @@ class Migration(migrations.Migration):
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name='UsedIngredients', name='UsedIngredient',
fields=[ fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('amount', models.PositiveIntegerField(help_text='Please specify the used amount of the ingredient', verbose_name='Amount')), ('amount', models.PositiveIntegerField(help_text='Please specify the used amount of the ingredient', verbose_name='Amount')),
@ -88,7 +88,7 @@ class Migration(migrations.Migration):
migrations.AddField( migrations.AddField(
model_name='recipe', model_name='recipe',
name='ingredients', name='ingredients',
field=models.ManyToManyField(through='food_planner.UsedIngredients', to='food_planner.Ingredient'), field=models.ManyToManyField(through='food_planner.UsedIngredient', to='food_planner.Ingredient'),
), ),
migrations.AddField( migrations.AddField(
model_name='recipe', model_name='recipe',

4
food_planner/models.py
View File

@ -59,7 +59,7 @@ class Recipe(models.Model):
author = models.ForeignKey(User, models.SET_NULL, null=True) author = models.ForeignKey(User, models.SET_NULL, null=True)
kitchen_utilities = models.ManyToManyField(KitchenUtility, kitchen_utilities = models.ManyToManyField(KitchenUtility,
through='UsedKitchenUtilities') through='UsedKitchenUtilities')
ingredients = models.ManyToManyField(Ingredient, through='UsedIngredients') ingredients = models.ManyToManyField(Ingredient, through='UsedIngredient')
name = models.CharField(_('Name'), max_length=255) name = models.CharField(_('Name'), max_length=255)
image = models.ImageField(_('Image'), blank=True, null=True) image = models.ImageField(_('Image'), blank=True, null=True)
@ -104,7 +104,7 @@ class UsedKitchenUtilities(models.Model):
default=1) default=1)
class UsedIngredients(models.Model): class UsedIngredient(models.Model):
recipe = models.ForeignKey(Recipe, models.CASCADE) recipe = models.ForeignKey(Recipe, models.CASCADE)
ingredient = models.ForeignKey(Ingredient, models.CASCADE) ingredient = models.ForeignKey(Ingredient, models.CASCADE)
amount = models.PositiveIntegerField(_('Amount'), amount = models.PositiveIntegerField(_('Amount'),