From 0b5561b39128ad37a813c11ef4781ed69b832782 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 25 Jul 2025 17:23:34 -0400 Subject: [PATCH] Fix migrations for M2M relations to ObjectType --- .../migrations/0111_rename_content_types.py | 10 ++--- .../0112_tag_update_object_types.py | 2 +- .../migrations/0131_concrete_objecttype.py | 42 +++++++++++++++++++ ...07_objectpermission_update_object_types.py | 2 +- .../migrations/0009_update_group_perms.py | 2 +- .../migrations/0010_concrete_objecttype.py | 17 ++++++++ 6 files changed, 67 insertions(+), 8 deletions(-) create mode 100644 netbox/extras/migrations/0131_concrete_objecttype.py create mode 100644 netbox/users/migrations/0010_concrete_objecttype.py diff --git a/netbox/extras/migrations/0111_rename_content_types.py b/netbox/extras/migrations/0111_rename_content_types.py index 1317bb345..8a5db53ff 100644 --- a/netbox/extras/migrations/0111_rename_content_types.py +++ b/netbox/extras/migrations/0111_rename_content_types.py @@ -18,7 +18,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='customfield', name='object_types', - field=models.ManyToManyField(related_name='custom_fields', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='custom_fields', to='core.objecttype'), ), migrations.AlterField( model_name='customfield', @@ -45,7 +45,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='customlink', name='object_types', - field=models.ManyToManyField(related_name='custom_links', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='custom_links', to='core.objecttype'), ), migrations.RunSQL( 'ALTER TABLE extras_customlink_content_types_id_seq RENAME TO extras_customlink_object_types_id_seq' @@ -59,7 +59,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='eventrule', name='object_types', - field=models.ManyToManyField(related_name='event_rules', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='event_rules', to='core.objecttype'), ), migrations.RunSQL( 'ALTER TABLE extras_eventrule_content_types_id_seq RENAME TO extras_eventrule_object_types_id_seq' @@ -73,7 +73,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='exporttemplate', name='object_types', - field=models.ManyToManyField(related_name='export_templates', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='export_templates', to='core.objecttype'), ), migrations.RunSQL( 'ALTER TABLE extras_exporttemplate_content_types_id_seq RENAME TO extras_exporttemplate_object_types_id_seq' @@ -87,7 +87,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='savedfilter', name='object_types', - field=models.ManyToManyField(related_name='saved_filters', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='saved_filters', to='core.objecttype'), ), migrations.RunSQL( 'ALTER TABLE extras_savedfilter_content_types_id_seq RENAME TO extras_savedfilter_object_types_id_seq' diff --git a/netbox/extras/migrations/0112_tag_update_object_types.py b/netbox/extras/migrations/0112_tag_update_object_types.py index 5884ddfd0..e863ba8c3 100644 --- a/netbox/extras/migrations/0112_tag_update_object_types.py +++ b/netbox/extras/migrations/0112_tag_update_object_types.py @@ -11,6 +11,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='tag', name='object_types', - field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'), + field=models.ManyToManyField(blank=True, related_name='+', to='core.objecttype'), ), ] diff --git a/netbox/extras/migrations/0131_concrete_objecttype.py b/netbox/extras/migrations/0131_concrete_objecttype.py new file mode 100644 index 000000000..6aed4d97d --- /dev/null +++ b/netbox/extras/migrations/0131_concrete_objecttype.py @@ -0,0 +1,42 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('extras', '0130_imageattachment_description'), + ] + + operations = [ + migrations.AlterField( + model_name='customfield', + name='object_types', + field=models.ManyToManyField(related_name='custom_fields', to='contenttypes.contenttype'), + ), + migrations.AlterField( + model_name='customlink', + name='object_types', + field=models.ManyToManyField(related_name='custom_links', to='contenttypes.contenttype'), + ), + migrations.AlterField( + model_name='eventrule', + name='object_types', + field=models.ManyToManyField(related_name='event_rules', to='contenttypes.contenttype'), + ), + migrations.AlterField( + model_name='exporttemplate', + name='object_types', + field=models.ManyToManyField(related_name='export_templates', to='contenttypes.contenttype'), + ), + migrations.AlterField( + model_name='savedfilter', + name='object_types', + field=models.ManyToManyField(related_name='saved_filters', to='contenttypes.contenttype'), + ), + migrations.AlterField( + model_name='tag', + name='object_types', + field=models.ManyToManyField(blank=True, related_name='+', to='contenttypes.contenttype'), + ), + ] diff --git a/netbox/users/migrations/0007_objectpermission_update_object_types.py b/netbox/users/migrations/0007_objectpermission_update_object_types.py index 9e010de97..3be93270b 100644 --- a/netbox/users/migrations/0007_objectpermission_update_object_types.py +++ b/netbox/users/migrations/0007_objectpermission_update_object_types.py @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='objectpermission', name='object_types', - field=models.ManyToManyField(related_name='object_permissions', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='object_permissions', to='core.objecttype'), ), ] diff --git a/netbox/users/migrations/0009_update_group_perms.py b/netbox/users/migrations/0009_update_group_perms.py index f607e5d9c..af0f123c5 100644 --- a/netbox/users/migrations/0009_update_group_perms.py +++ b/netbox/users/migrations/0009_update_group_perms.py @@ -27,6 +27,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='objectpermission', name='object_types', - field=models.ManyToManyField(related_name='object_permissions', to='contenttypes.contenttype'), + field=models.ManyToManyField(related_name='object_permissions', to='core.objecttype'), ), ] diff --git a/netbox/users/migrations/0010_concrete_objecttype.py b/netbox/users/migrations/0010_concrete_objecttype.py new file mode 100644 index 000000000..436758846 --- /dev/null +++ b/netbox/users/migrations/0010_concrete_objecttype.py @@ -0,0 +1,17 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('users', '0009_update_group_perms'), + ] + + operations = [ + migrations.AlterField( + model_name='objectpermission', + name='object_types', + field=models.ManyToManyField(related_name='object_permissions', to='contenttypes.contenttype'), + ), + ]