From 1313d1c225b9c9df9891b7be55bb3ec5dc524293 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Mon, 22 Jul 2024 14:12:30 +0700 Subject: [PATCH] 7025 remove m2m --- ...rcuitgroup_circuitgroupassignment_and_more.py | 16 +++++++++------- netbox/circuits/models/circuits.py | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/netbox/circuits/migrations/0044_circuitgroup_circuitgroupassignment_and_more.py b/netbox/circuits/migrations/0044_circuitgroup_circuitgroupassignment_and_more.py index 6f784ff19..70feda951 100644 --- a/netbox/circuits/migrations/0044_circuitgroup_circuitgroupassignment_and_more.py +++ b/netbox/circuits/migrations/0044_circuitgroup_circuitgroupassignment_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.7 on 2024-07-19 08:04 +# Generated by Django 5.0.7 on 2024-07-22 06:27 import django.db.models.deletion import taggit.managers @@ -65,7 +65,14 @@ class Migration(migrations.Migration): to='circuits.circuit', ), ), - ('group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='circuits.circuitgroup')), + ( + 'group', + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name='circuit_group_assignments', + to='circuits.circuitgroup', + ), + ), ('tags', taggit.managers.TaggableManager(through='extras.TaggedItem', to='extras.Tag')), ], options={ @@ -74,11 +81,6 @@ class Migration(migrations.Migration): 'ordering': ('circuit', 'priority', 'pk'), }, ), - migrations.AddField( - model_name='circuitgroup', - name='circuits', - field=models.ManyToManyField(through='circuits.CircuitGroupAssignment', to='circuits.circuit'), - ), migrations.AddConstraint( model_name='circuitgroupassignment', constraint=models.UniqueConstraint( diff --git a/netbox/circuits/models/circuits.py b/netbox/circuits/models/circuits.py index 3ca77c092..5da3c8405 100644 --- a/netbox/circuits/models/circuits.py +++ b/netbox/circuits/models/circuits.py @@ -163,7 +163,6 @@ class CircuitGroup(OrganizationalModel): blank=True, null=True ) - circuits = models.ManyToManyField(Circuit, through='CircuitGroupAssignment') class Meta: ordering = ('name', 'pk') # Name may be non-unique @@ -186,6 +185,7 @@ class CircuitGroupAssignment(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, group = models.ForeignKey( CircuitGroup, on_delete=models.CASCADE, + related_name='circuit_group_assignments' ) priority = models.CharField( verbose_name=_('priority'),