Revert "Fix order of 0013, 0014 and 0015 migrations."

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 7.4.1
+current_version = 7.5.0.alpha
 commit = True
 tag = True
 tag_name = {new_version}

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
         django: ['3.2', '4.2']
         cms: ['3.11','4.1']
 
-    name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, CMS ${{ matrix.mozilla_django_oidc }})
+    name: Run the test suite (Python ${{ matrix.python }}, Django ${{ matrix.django }}, CMS ${{ matrix.cms }})
 
     steps:
       - uses: actions/checkout@v4

aldryn_forms/__init__.py

@@ -1 +1 @@
-__version__ = '7.4.1'
+__version__ = '7.5.0.alpha'

aldryn_forms/contrib/email_notifications/migrations/0007_alter_emailnotification_id.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2 on 2024-11-27 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('email_notifications', '0006_alter_emailnotification_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='emailnotification',
+            name='id',
+            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

aldryn_forms/migrations/0015_add_field_is_enable_autofill_from_url_params.py → aldryn_forms/migrations/0013_add_field_is_enable_autofill_from_url_params.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aldryn_forms', '0014_fileupload_name_help_text'),
+        ('aldryn_forms', '0012_auto_20190104_1242'),
     ]
 
     operations = [

aldryn_forms/migrations/0013_multiple_files_pload.py → aldryn_forms/migrations/0014_multiple_files_pload.py

@@ -13,7 +13,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aldryn_forms', '0012_auto_20190104_1242'),
+        ('aldryn_forms', '0013_add_field_is_enable_autofill_from_url_params'),
     ]
 
     operations = [

aldryn_forms/migrations/0014_fileupload_name_help_text.py → aldryn_forms/migrations/0015_fileupload_name_help_text.py

@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aldryn_forms', '0013_multiple_files_pload'),
+        ('aldryn_forms', '0014_multiple_files_pload'),
     ]
 
     operations = [

aldryn_forms/migrations/0016_date_time_fields.py

@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('aldryn_forms', '0015_add_field_is_enable_autofill_from_url_params'),
+        ('aldryn_forms', '0015_fileupload_name_help_text'),
     ]
 
     operations = [

aldryn_forms/migrations/0019_auto_20241127_1746.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2 on 2024-11-27 16:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('aldryn_forms', '0018_formplugin_use_form_action'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='formplugin',
+            name='action_backend',
+            field=models.CharField(choices=[('none', 'No action'), ('email_only', 'Only send email'), ('default', 'Save to site administration and send email')], default='default', max_length=15, verbose_name='Action backend'),
+        ),
+        migrations.AlterField(
+            model_name='formsubmission',
+            name='id',
+            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='option',
+            name='id',
+            field=models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

aldryn_forms/models.py

@@ -497,15 +497,15 @@ class EmailFieldPlugin(FieldPluginBase):
     )
 
     def get_parent_form(self):
-        parent = self.get_parent()
+        parent = self.parent
         while parent is not None:
             if parent.plugin_type in ("FormPlugin", "EmailNotificationForm"):
                 break
-            parent = parent.get_parent()
+            parent = self.parent
         return parent
 
     def get_parent_form_action_backend(self):
-        parent = self.get_parent_form()
+        parent = self.parent
         if parent is not None:
             return parent, get_action_backends().get(parent.get_plugin_instance()[0].action_backend)
         return None, None

tests/settings.py

@@ -4,6 +4,7 @@
 HELPER_SETTINGS = {
     'INSTALLED_APPS': [
         'tests',
+        "aldryn_forms",
         'aldryn_forms.contrib.email_notifications',
         'djangocms_text_ckeditor',
         'captcha',
@@ -28,7 +29,7 @@
 
 
 def run():
-    from djangocms_helper import runner
+    from app_helper import runner
     runner.cms('aldryn_forms')