From f0291aa60fb0368e500dc079adf38a4c63727789 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 2 Apr 2024 08:31:53 -0400 Subject: [PATCH] Fix ordering of Groups --- netbox/users/migrations/0006_custom_group_model.py | 1 + netbox/users/models.py | 1 + netbox/users/views.py | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/users/migrations/0006_custom_group_model.py b/netbox/users/migrations/0006_custom_group_model.py index 04f4d0fd8..ff970dc13 100644 --- a/netbox/users/migrations/0006_custom_group_model.py +++ b/netbox/users/migrations/0006_custom_group_model.py @@ -32,6 +32,7 @@ class Migration(migrations.Migration): ('permissions', models.ManyToManyField(blank=True, related_name='groups', related_query_name='group', to='auth.permission')), ], options={ + 'ordering': ('name',), 'verbose_name': 'group', 'verbose_name_plural': 'groups', }, diff --git a/netbox/users/models.py b/netbox/users/models.py index d9a86e88b..875d1a76f 100644 --- a/netbox/users/models.py +++ b/netbox/users/models.py @@ -72,6 +72,7 @@ class Group(models.Model): objects = NetBoxGroupManager() class Meta: + ordering = ('name',) verbose_name = _('group') verbose_name_plural = _('groups') diff --git a/netbox/users/views.py b/netbox/users/views.py index 662e5e573..a8754d4d9 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -110,7 +110,7 @@ class UserBulkDeleteView(generic.BulkDeleteView): # class GroupListView(generic.ObjectListView): - queryset = Group.objects.annotate(users_count=Count('user')) + queryset = Group.objects.annotate(users_count=Count('user')).order_by('name') filterset = filtersets.GroupFilterSet filterset_form = forms.GroupFilterForm table = tables.GroupTable @@ -139,7 +139,7 @@ class GroupBulkImportView(generic.BulkImportView): class GroupBulkDeleteView(generic.BulkDeleteView): - queryset = Group.objects.annotate(users_count=Count('user')) + queryset = Group.objects.annotate(users_count=Count('user')).order_by('name') filterset = filtersets.GroupFilterSet table = tables.GroupTable