From 75eea50d71bd97c253a31e60267417d7f963613e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 16 May 2022 16:35:32 -0400 Subject: [PATCH] Order CableTerminations by cable, cable_end --- netbox/dcim/migrations/0154_cabletermination.py | 2 +- netbox/dcim/models/cables.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/migrations/0154_cabletermination.py b/netbox/dcim/migrations/0154_cabletermination.py index 5a3a335fe..88245d483 100644 --- a/netbox/dcim/migrations/0154_cabletermination.py +++ b/netbox/dcim/migrations/0154_cabletermination.py @@ -20,7 +20,7 @@ class Migration(migrations.Migration): ('termination_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(models.Q(('app_label', 'circuits'), ('model__in', ('circuittermination',))), models.Q(('app_label', 'dcim'), ('model__in', ('consoleport', 'consoleserverport', 'frontport', 'interface', 'powerfeed', 'poweroutlet', 'powerport', 'rearport'))), _connector='OR')), on_delete=django.db.models.deletion.PROTECT, related_name='+', to='contenttypes.contenttype')), ], options={ - 'ordering': ['pk'], + 'ordering': ('cable', 'cable_end', 'pk'), }, ), migrations.AddConstraint( diff --git a/netbox/dcim/models/cables.py b/netbox/dcim/models/cables.py index 0f57bb685..dd5599a1d 100644 --- a/netbox/dcim/models/cables.py +++ b/netbox/dcim/models/cables.py @@ -226,7 +226,7 @@ class CableTermination(models.Model): objects = RestrictedQuerySet.as_manager() class Meta: - ordering = ['pk'] + ordering = ('cable', 'cable_end', 'pk') constraints = ( models.UniqueConstraint( fields=('termination_type', 'termination_id'),