From c2d1988cb3f74f8a4f7c6005d32caadc69164610 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 1 Nov 2023 11:56:14 -0400 Subject: [PATCH] Closes #14035: Order global search results of equivalent weight by value (#14140) --- .../migrations/0099_cachedvalue_ordering.py | 17 +++++++++++++++++ netbox/extras/models/search.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 netbox/extras/migrations/0099_cachedvalue_ordering.py diff --git a/netbox/extras/migrations/0099_cachedvalue_ordering.py b/netbox/extras/migrations/0099_cachedvalue_ordering.py new file mode 100644 index 00000000000..242ffd98357 --- /dev/null +++ b/netbox/extras/migrations/0099_cachedvalue_ordering.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.6 on 2023-10-30 14:04 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('extras', '0098_webhook_custom_field_data_webhook_tags'), + ] + + operations = [ + migrations.AlterModelOptions( + name='cachedvalue', + options={'ordering': ('weight', 'object_type', 'value', 'object_id')}, + ), + ] diff --git a/netbox/extras/models/search.py b/netbox/extras/models/search.py index debe4c64853..39ff8021541 100644 --- a/netbox/extras/models/search.py +++ b/netbox/extras/models/search.py @@ -50,7 +50,7 @@ class CachedValue(models.Model): ) class Meta: - ordering = ('weight', 'object_type', 'object_id') + ordering = ('weight', 'object_type', 'value', 'object_id') verbose_name = _('cached value') verbose_name_plural = _('cached values')