Briq/django-admin-confirm-briq
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Formatted with black and reached 100% coverage

Browse Source
This commit is contained in:
Thu Trang Pham
2020-11-08 09:51:49 -08:00
parent c586100098
commit a95383cfa2
17 changed files with 465 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/market/admin.py
+4 -4
View File
@@ -6,19 +6,19 @@ from .models import Item, Inventory, Shop
class ItemAdmin(AdminConfirmMixin, admin.ModelAdmin):
list_display = ('name', 'price', 'currency')
list_display = ("name", "price", "currency")
confirm_change = True
class InventoryAdmin(AdminConfirmMixin, admin.ModelAdmin):
list_display = ('shop', 'item', 'quantity')
list_display = ("shop", "item", "quantity")
confirm_change = True
confirm_add = True
confirmation_fields = ['shop']
confirmation_fields = ["quantity"]
class ShopAdmin(AdminConfirmMixin, admin.ModelAdmin):
confirmation_fields = ['name']
confirmation_fields = ["name"]
admin.site.register(Item, ItemAdmin)
tests/market/apps.py
+1 -1
View File
@@ -2,4 +2,4 @@ from django.apps import AppConfig
class MarketConfig(AppConfig):
name = 'market'
name = "market"
tests/market/migrations/0001_initial.py
+38 -11
View File
@@ -8,25 +8,52 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
]
dependencies = []
operations = [
migrations.CreateModel(
name='Item',
name="Item",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=120)),
('price', models.DecimalField(decimal_places=2, max_digits=5)),
('currency', models.CharField(choices=[('CAD', 'CAD'), ('USD', 'USD')], max_length=3)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=120)),
("price", models.DecimalField(decimal_places=2, max_digits=5)),
(
"currency",
models.CharField(
choices=[("CAD", "CAD"), ("USD", "USD")], max_length=3
),
),
],
),
migrations.CreateModel(
name='Stock',
name="Stock",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('quantity', models.PositiveIntegerField()),
('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='all_stock', to='market.Item')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("quantity", models.PositiveIntegerField()),
(
"item",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="all_stock",
to="market.Item",
),
),
],
),
]
tests/market/migrations/0002_auto_20201031_2057.py
+40 -15
View File
@@ -7,38 +7,63 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('market', '0001_initial'),
("market", "0001_initial"),
]
operations = [
migrations.CreateModel(
name='Inventory',
name="Inventory",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('quantity', models.PositiveIntegerField()),
('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='market.Item')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("quantity", models.PositiveIntegerField()),
(
"item",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, to="market.Item"
),
),
],
options={
'ordering': ['shop', 'item__name'],
"ordering": ["shop", "item__name"],
},
),
migrations.CreateModel(
name='Shop',
name="Shop",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=120)),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("name", models.CharField(max_length=120)),
],
),
migrations.DeleteModel(
name='Stock',
name="Stock",
),
migrations.AddField(
model_name='inventory',
name='shop',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='inventory', to='market.Shop'),
model_name="inventory",
name="shop",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="inventory",
to="market.Shop",
),
),
migrations.AlterUniqueTogether(
name='inventory',
unique_together={('shop', 'item')},
name="inventory",
unique_together={("shop", "item")},
),
]
tests/market/migrations/0003_auto_20201108_1717.py
+25
View File
@@ -0,0 +1,25 @@
# Generated by Django 3.0.10 on 2020-11-08 17:17
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("market", "0002_auto_20201031_2057"),
]
operations = [
migrations.AlterModelOptions(
name="inventory",
options={
"ordering": ["shop", "item__name"],
"verbose_name_plural": "Inventory",
},
),
migrations.AlterField(
model_name="inventory",
name="quantity",
field=models.PositiveIntegerField(blank=True, default=0, null=True),
),
]
tests/market/models.py
+9 -7
View File
@@ -3,8 +3,8 @@ from django.db import models
class Item(models.Model):
VALID_CURRENCIES = (
('CAD', 'CAD'),
('USD', 'USD'),
("CAD", "CAD"),
("USD", "USD"),
)
name = models.CharField(max_length=120)
price = models.DecimalField(max_digits=5, decimal_places=2)
@@ -23,10 +23,12 @@ class Shop(models.Model):
class Inventory(models.Model):
class Meta:
unique_together = ['shop', 'item']
ordering = ['shop', 'item__name']
verbose_name_plural = 'Inventory'
unique_together = ["shop", "item"]
ordering = ["shop", "item__name"]
verbose_name_plural = "Inventory"
shop = models.ForeignKey(to=Shop, on_delete=models.CASCADE, related_name='inventory')
shop = models.ForeignKey(
to=Shop, on_delete=models.CASCADE, related_name="inventory"
)
item = models.ForeignKey(to=Item, on_delete=models.CASCADE)
quantity = models.PositiveIntegerField()
quantity = models.PositiveIntegerField(default=0, null=True, blank=True)