Aggiorno dall'upstream

tests/market/admin/checkout_admin.py

@@ -1,5 +1,5 @@
 from django.core.exceptions import ValidationError
-from admin_confirm.admin import AdminConfirmMixin
+from admin_confirm import AdminConfirmMixin
 
 from django.contrib.admin import ModelAdmin
 from django.forms import ModelForm

tests/market/admin/generalmanager_admin.py

@@ -1,6 +1,10 @@
 from django.contrib.admin import ModelAdmin
+from admin_confirm.admin import AdminConfirmMixin
 
 
-class GeneralManagerAdmin(ModelAdmin):
+class GeneralManagerAdmin(AdminConfirmMixin, ModelAdmin):
     save_as = True
     search_fields = ["name"]
+    confirm_change = True
+    confirm_add = True
+    confirmation_fields = ["name", "headshot"]

tests/market/admin/shop_admin.py

@@ -1,5 +1,5 @@
 from django.contrib.admin import ModelAdmin
-from admin_confirm.admin import AdminConfirmMixin, confirm_action
+from admin_confirm import AdminConfirmMixin, confirm_action
 
 
 class ShopAdmin(AdminConfirmMixin, ModelAdmin):

tests/market/apps.py

@@ -1,5 +0,0 @@
-from django.apps import AppConfig
-
-
-class MarketConfig(AppConfig):
-    name = "market"

tests/market/migrations/0013_auto_20210702_0041.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.5 on 2021-07-02 00:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market', '0012_auto_20210326_0240'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='itemsale',
+            name='total',
+            field=models.DecimalField(decimal_places=2, max_digits=5),
+        ),
+        migrations.AlterField(
+            model_name='shoppingmall',
+            name='shops',
+            field=models.ManyToManyField(blank=True, to='market.Shop'),
+        ),
+        migrations.AlterField(
+            model_name='transaction',
+            name='total',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=5),
+        ),
+    ]

tests/market/migrations/0014_auto_20220413_0116.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.7 on 2022-04-13 01:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('market', '0013_auto_20210702_0041'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='shoppingmall',
+            name='general_manager',
+            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='market.generalmanager', verbose_name='manager'),
+        ),
+    ]

tests/market/models.py

@@ -54,7 +54,7 @@ class ShoppingMall(models.Model):
     name = models.CharField(max_length=120)
     shops = models.ManyToManyField(Shop, blank=True)
     general_manager = models.OneToOneField(
-        GeneralManager, on_delete=models.CASCADE, null=True, blank=True
+        GeneralManager, on_delete=models.CASCADE, null=True, blank=True, verbose_name="manager"
     )
     town = models.ForeignKey(Town, on_delete=models.CASCADE, null=True, blank=True)