NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Fix ordering of Groups

Browse Source
This commit is contained in:
Jeremy Stretch 2024-04-02 08:31:53 -04:00
parent 3ab2f25ee1
commit f0291aa60f
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/users/migrations/0006_custom_group_model.py
View File

@ -32,6 +32,7 @@ class Migration(migrations.Migration):
('permissions', models.ManyToManyField(blank=True, related_name='groups', related_query_name='group', to='auth.permission')), ('permissions', models.ManyToManyField(blank=True, related_name='groups', related_query_name='group', to='auth.permission')),
], ],
options={ options={
'ordering': ('name',),
'verbose_name': 'group', 'verbose_name': 'group',
'verbose_name_plural': 'groups', 'verbose_name_plural': 'groups',
}, },

1
netbox/users/models.py
View File

@ -72,6 +72,7 @@ class Group(models.Model):
objects = NetBoxGroupManager() objects = NetBoxGroupManager()
class Meta: class Meta:
ordering = ('name',)
verbose_name = _('group') verbose_name = _('group')
verbose_name_plural = _('groups') verbose_name_plural = _('groups')

4
netbox/users/views.py
View File

@ -110,7 +110,7 @@ class UserBulkDeleteView(generic.BulkDeleteView):
# #
class GroupListView(generic.ObjectListView): 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 = filtersets.GroupFilterSet
filterset_form = forms.GroupFilterForm filterset_form = forms.GroupFilterForm
table = tables.GroupTable table = tables.GroupTable
@ -139,7 +139,7 @@ class GroupBulkImportView(generic.BulkImportView):
class GroupBulkDeleteView(generic.BulkDeleteView): 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 filterset = filtersets.GroupFilterSet
table = tables.GroupTable table = tables.GroupTable