Merge branch 'release/0.3.68' into main

clinicedc · Dec 6, 2023 · 9b03cf0 · 9b03cf0
2 parents a2afae3 + d5f5865
commit 9b03cf0
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 246 deletions.
diff --git a/edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py b/edc_data_manager/migrations/0032_alter_datadictionary_options_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.7 on 2023-12-05 19:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("edc_data_manager", "0031_alter_dataquery_visit_code_sequence_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="datadictionary",
+            options={
+                "default_permissions": ("view", "export"),
+                "verbose_name": "Data Dictionary Item",
+                "verbose_name_plural": "Data Dictionary Items",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="dataquery",
+            options={
+                "default_manager_name": "objects",
+                "default_permissions": ("add", "change", "delete", "view", "export", "import"),
+                "verbose_name": "Data Query",
+                "verbose_name_plural": "Data Queries",
+            },
+        ),
+        migrations.AlterModelOptions(
+            name="queryrule",
+            options={
+                "default_manager_name": "objects",
+                "default_permissions": ("add", "change", "delete", "view", "export", "import"),
+                "verbose_name": "Query Rule",
+                "verbose_name_plural": "Query Rules",
+            },
+        ),
+    ]
diff --git a/edc_data_manager/migrations/0032_validationerrors_and_more.py b/edc_data_manager/migrations/0032_validationerrors_and_more.py
diff --git a/...tions_alter_dataquery_options_and_more.py → ...datadictionary_locale_created_and_more.py b/...tions_alter_dataquery_options_and_more.py → ...datadictionary_locale_created_and_more.py
@@ -1,54 +1,14 @@
-# Generated by Django 4.2.7 on 2023-12-03 00:22
+# Generated by Django 4.2.7 on 2023-12-05 19:49
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("edc_data_manager", "0034_issue"),
+        ("edc_data_manager", "0032_alter_datadictionary_options_and_more"),
     ]
 
     operations = [
-        migrations.AlterModelOptions(
-            name="datadictionary",
-            options={
-                "default_permissions": ("view", "export"),
-                "verbose_name": "Data Dictionary Item",
-                "verbose_name_plural": "Data Dictionary Items",
-            },
-        ),
-        migrations.AlterModelOptions(
-            name="dataquery",
-            options={
-                "default_manager_name": "objects",
-                "default_permissions": (
-                    "add",
-                    "change",
-                    "delete",
-                    "view",
-                    "export",
-                    "import",
-                ),
-                "verbose_name": "Data Query",
-                "verbose_name_plural": "Data Queries",
-            },
-        ),
-        migrations.AlterModelOptions(
-            name="queryrule",
-            options={
-                "default_manager_name": "objects",
-                "default_permissions": (
-                    "add",
-                    "change",
-                    "delete",
-                    "view",
-                    "export",
-                    "import",
-                ),
-                "verbose_name": "Query Rule",
-                "verbose_name_plural": "Query Rules",
-            },
-        ),
         migrations.AddField(
             model_name="datadictionary",
             name="locale_created",
@@ -213,11 +173,4 @@ class Migration(migrations.Migration):
             name="prompt",
             field=models.CharField(max_length=500),
         ),
-        migrations.AddIndex(
-            model_name="datadictionary",
-            index=models.Index(
-                fields=["model", "number", "prompt"],
-                name="edc_data_ma_model_92b469_idx",
-            ),
-        ),
     ]
diff --git a/edc_data_manager/migrations/0033_delete_validationerrors.py b/edc_data_manager/migrations/0033_delete_validationerrors.py
diff --git a/edc_data_manager/migrations/0034_issue.py b/edc_data_manager/migrations/0034_issue.py
@@ -1,12 +1,12 @@
-# Generated by Django 4.2.7 on 2023-11-28 20:09
+# Generated by Django 4.2.7 on 2023-12-05 19:50
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("edc_form_runners", "0001_initial"),
-        ("edc_data_manager", "0033_delete_validationerrors"),
+        ("edc_data_manager", "0033_datadictionary_locale_created_and_more"),
+        ("edc_form_runners", "0002_alter_issue_options_and_more"),
     ]
 
     operations = [

diff --git a/edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py b/edc_data_manager/migrations/0035_datadictionary_edc_data_ma_model_92b469_idx.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.7 on 2023-12-05 20:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("edc_data_manager", "0034_issue"),
+    ]
+
+    operations = [
+        migrations.AddIndex(
+            model_name="datadictionary",
+            index=models.Index(
+                fields=["model", "number", "prompt"], name="edc_data_ma_model_92b469_idx"
+            ),
+        ),
+    ]