Skip to content

Commit 2a44aff

Browse files
authored
Fixes #18594: asn_count sort in Sites list (#18634)
* Fixes #18594: asn_count sort in Sites list * Fixes similar issue in `circuits.views.ProviderListView` Thanks @bctiemann for point this out!
1 parent 57ef447 commit 2a44aff

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

netbox/circuits/tables/providers.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ class ProviderTable(ContactsColumnMixin, NetBoxTable):
3333
verbose_name=_('ASNs')
3434
)
3535
asn_count = columns.LinkedCountColumn(
36-
accessor=tables.A('asns__count'),
3736
viewname='ipam:asn_list',
3837
url_params={'provider_id': 'pk'},
3938
verbose_name=_('ASN Count')

netbox/circuits/views.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from django.utils.translation import gettext_lazy as _
55

66
from dcim.views import PathTraceView
7+
from ipam.models import ASN
78
from netbox.views import generic
89
from tenancy.views import ObjectContactsView
910
from utilities.forms import ConfirmationForm
@@ -20,7 +21,8 @@
2021
@register_model_view(Provider, 'list', path='', detail=False)
2122
class ProviderListView(generic.ObjectListView):
2223
queryset = Provider.objects.annotate(
23-
count_circuits=count_related(Circuit, 'provider')
24+
count_circuits=count_related(Circuit, 'provider'),
25+
asn_count=count_related(ASN, 'providers'),
2426
)
2527
filterset = filtersets.ProviderFilterSet
2628
filterset_form = forms.ProviderFilterForm

netbox/dcim/tables/sites.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ class SiteTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
9494
verbose_name=_('ASNs')
9595
)
9696
asn_count = columns.LinkedCountColumn(
97-
accessor=tables.A('asns__count'),
9897
viewname='ipam:asn_list',
9998
url_params={'site_id': 'pk'},
10099
verbose_name=_('ASN Count')

netbox/dcim/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,8 @@ class SiteGroupContactsView(ObjectContactsView):
422422
@register_model_view(Site, 'list', path='', detail=False)
423423
class SiteListView(generic.ObjectListView):
424424
queryset = Site.objects.annotate(
425-
device_count=count_related(Device, 'site')
425+
device_count=count_related(Device, 'site'),
426+
asn_count=count_related(ASN, 'sites')
426427
)
427428
filterset = filtersets.SiteFilterSet
428429
filterset_form = forms.SiteFilterForm

0 commit comments

Comments
 (0)