From 3d24239b68f9025553da32955715526916827c54 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 28 Feb 2024 16:40:57 -0500 Subject: [PATCH] Fix ContentType resolution --- .../users/migrations/0006_custom_group_model.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/users/migrations/0006_custom_group_model.py b/netbox/users/migrations/0006_custom_group_model.py index 10e09d0dd..282da3ce0 100644 --- a/netbox/users/migrations/0006_custom_group_model.py +++ b/netbox/users/migrations/0006_custom_group_model.py @@ -10,10 +10,9 @@ def update_custom_fields(apps, schema_editor): CustomField = apps.get_model('extras', 'CustomField') Group = apps.get_model('users', 'Group') - old_ct = ContentType.objects.get_by_natural_key('users', 'netboxgroup') - new_ct = ContentType.objects.get_for_model(Group) - - CustomField.objects.filter(object_type=old_ct).update(object_type=new_ct) + if old_ct := ContentType.objects.filter(app_label='users', model='netboxgroup').first(): + new_ct = ContentType.objects.get_for_model(Group) + CustomField.objects.filter(object_type=old_ct).update(object_type=new_ct) class Migration(migrations.Migration): @@ -63,10 +62,6 @@ class Migration(migrations.Migration): field=models.ManyToManyField(blank=True, related_name='object_permissions', to='users.group'), ), - migrations.DeleteModel( - name='NetBoxGroup', - ), - # Delete groups from the old table migrations.RunSQL( "DELETE from auth_group" @@ -77,4 +72,9 @@ class Migration(migrations.Migration): code=update_custom_fields, reverse_code=migrations.RunPython.noop ), + + # Delete the proxy model + migrations.DeleteModel( + name='NetBoxGroup', + ), ]