Просмотр исходного кода

Order CableTerminations by cable, cable_end

jeremystretch 3 лет назад
Родитель
Сommit
75eea50d71
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      netbox/dcim/migrations/0154_cabletermination.py
  2. 1 1
      netbox/dcim/models/cables.py

+ 1 - 1
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')),
                 ('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={
             options={
-                'ordering': ['pk'],
+                'ordering': ('cable', 'cable_end', 'pk'),
             },
             },
         ),
         ),
         migrations.AddConstraint(
         migrations.AddConstraint(

+ 1 - 1
netbox/dcim/models/cables.py

@@ -226,7 +226,7 @@ class CableTermination(models.Model):
     objects = RestrictedQuerySet.as_manager()
     objects = RestrictedQuerySet.as_manager()
 
 
     class Meta:
     class Meta:
-        ordering = ['pk']
+        ordering = ('cable', 'cable_end', 'pk')
         constraints = (
         constraints = (
             models.UniqueConstraint(
             models.UniqueConstraint(
                 fields=('termination_type', 'termination_id'),
                 fields=('termination_type', 'termination_id'),