From e979a0e22739a1a3604997b6c5b6ef64e97c4d29 Mon Sep 17 00:00:00 2001 From: Laetitia Getti Date: Fri, 17 Mar 2023 16:21:42 +0100 Subject: [PATCH] ajout de ordered_item a l'admin --- la_chariotte/order/admin.py | 3 ++- ...rdereditem_item_alter_ordereditem_order.py | 24 +++++++++++++++++++ la_chariotte/order/models.py | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 la_chariotte/order/migrations/0007_alter_ordereditem_item_alter_ordereditem_order.py diff --git a/la_chariotte/order/admin.py b/la_chariotte/order/admin.py index 817ee91..0d4d29e 100644 --- a/la_chariotte/order/admin.py +++ b/la_chariotte/order/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin -from .models import Grouped_order, Order, Item +from .models import Grouped_order, Order, Item, OrderedItem admin.site.register(Grouped_order) admin.site.register(Order) admin.site.register(Item) +admin.site.register(OrderedItem) diff --git a/la_chariotte/order/migrations/0007_alter_ordereditem_item_alter_ordereditem_order.py b/la_chariotte/order/migrations/0007_alter_ordereditem_item_alter_ordereditem_order.py new file mode 100644 index 0000000..4af4531 --- /dev/null +++ b/la_chariotte/order/migrations/0007_alter_ordereditem_item_alter_ordereditem_order.py @@ -0,0 +1,24 @@ +# Generated by Django 4.1.7 on 2023-03-17 15:09 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('order', '0006_item_ordered_nb'), + ] + + operations = [ + migrations.AlterField( + model_name='ordereditem', + name='item', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='orders', to='order.item'), + ), + migrations.AlterField( + model_name='ordereditem', + name='order', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ordered_items', to='order.order'), + ), + ] diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py index 7714ad6..44a2619 100644 --- a/la_chariotte/order/models.py +++ b/la_chariotte/order/models.py @@ -26,3 +26,5 @@ class OrderedItem(models.Model): nb = models.PositiveSmallIntegerField(default=0) # works up to 32767 order = models.ForeignKey(Order, on_delete=models.CASCADE, related_name="ordered_items") item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name="orders") + def __str__(self): + return f"{self.nb} {self.item}, dans la commande {self.order.pk}"