squash migration

yverdon · Aug 17, 2023 · 7b3e5a8 · 7b3e5a8
1 parent 264c3bb
commit 7b3e5a8
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 124 deletions.
diff --git a/...ms/migrations/0023_alter_form_category.py → ...ory_and_delete_contacttypeforadminsite.py b/...ms/migrations/0023_alter_form_category.py → ...ory_and_delete_contacttypeforadminsite.py
@@ -21,4 +21,7 @@ class Migration(migrations.Migration):
                 verbose_name="catégorie",
             ),
         ),
+        migrations.DeleteModel(
+            name="ContactTypeForAdminSite",
+        ),
     ]
diff --git a/...igrations/0025_contactformforadminsite.py → ...igrations/0024_contactformforadminsite.py b/...igrations/0025_contactformforadminsite.py → ...igrations/0024_contactformforadminsite.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("forms", "0024_delete_contacttypeforadminsite"),
+        ("forms", "0023_alter_form_category_and_delete_contacttypeforadminsite"),
         ("submissions", "0022_contactform_and_more"),
     ]
 
@@ -23,4 +23,16 @@ class Migration(migrations.Migration):
             },
             bases=("submissions.contactform",),
         ),
+        migrations.CreateModel(
+            name="ContactTypeForAdminSite",
+            fields=[],
+            options={
+                "verbose_name": "1.9 Type de contact",
+                "verbose_name_plural": "1.9 Types de contacts",
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
+            },
+            bases=("submissions.contacttype",),
+        ),
     ]
diff --git a/geocity/apps/forms/migrations/0024_delete_contacttypeforadminsite.py b/geocity/apps/forms/migrations/0024_delete_contacttypeforadminsite.py
diff --git a/geocity/apps/forms/migrations/0026_contacttypeforadminsite.py b/geocity/apps/forms/migrations/0026_contacttypeforadminsite.py
diff --git a/geocity/apps/submissions/migrations/0022_contactform_and_more.py b/geocity/apps/submissions/migrations/0022_contactform_and_more.py
@@ -81,7 +81,7 @@ def migrate_contact_type_based_on_new_model(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("forms", "0024_delete_contacttypeforadminsite"),
+        ("forms", "0023_alter_form_category_and_delete_contacttypeforadminsite"),
         ("auth", "0012_alter_user_first_name_max_length"),
         ("submissions", "0021_add_contact_type"),
     ]
@@ -207,6 +207,7 @@ class Migration(migrations.Migration):
             model_name="submission",
             name="creditor_type",
             field=models.ForeignKey(
+                blank=True,
                 null=True,
                 on_delete=django.db.models.deletion.SET_NULL,
                 to="submissions.contacttype",
@@ -224,4 +225,20 @@ class Migration(migrations.Migration):
             ),
         ),
         migrations.RunPython(migrate_contact_type_based_on_new_model),
+        migrations.AlterModelOptions(
+            name="contacttype",
+            options={
+                "verbose_name": "1.9 Type de contact",
+                "verbose_name_plural": "1.9 Types de contacts",
+            },
+        ),
+        migrations.AddField(
+            model_name="contactform",
+            name="is_dynamic",
+            field=models.BooleanField(
+                default=False,
+                help_text="Permet à l'utilisateur d'ajouter ce type de contact lors de la saisie, autant de fois que souhaité.",
+                verbose_name="Dynamique",
+            ),
+        ),
     ]
diff --git a/geocity/apps/submissions/migrations/0023_alter_contacttype_options_and_more.py b/geocity/apps/submissions/migrations/0023_alter_contacttype_options_and_more.py
diff --git a/geocity/apps/submissions/migrations/0024_remove_contactform_is_used_dynamically_and_more.py b/geocity/apps/submissions/migrations/0024_remove_contactform_is_used_dynamically_and_more.py
diff --git a/geocity/apps/submissions/migrations/0025_alter_submission_creditor_type.py b/geocity/apps/submissions/migrations/0025_alter_submission_creditor_type.py