Resolve rebase migration conflicts

AlanCoding · Feb 6, 2024 · 13d1489 · 13d1489
1 parent cdc8dfc
commit 13d1489
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/test_app/migrations/0002_set_up_resources_test_data.py b/test_app/migrations/0002_set_up_resources_test_data.py
@@ -26,6 +26,7 @@ def create_test_data(apps, schema_editor):
 class Migration(migrations.Migration):
     dependencies = [
         ('test_app', '0001_initial'),
+        ('dab_rbac', '__first__'),  # needs to be a separate migration because of this dependency
     ]
 
     operations = [
@@ -40,4 +41,14 @@ class Migration(migrations.Migration):
             code=create_test_data,
             reverse_code=migrations.RunPython.noop
         ),
+        migrations.AddField(
+            model_name='team',
+            name='singleton_roles',
+            field=models.ManyToManyField(blank=True, to='dab_rbac.roledefinition'),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='singleton_roles',
+            field=models.ManyToManyField(blank=True, related_name='singleton_users', to='dab_rbac.roledefinition'),
+        ),
     ]
diff --git a/test_app/migrations/0002_singleton_roles.py b/test_app/migrations/0002_singleton_roles.py