Fix ordering of Groups

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',
             },

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')
 

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