diff --git a/README.md b/README.md index 42bf8b619..8429cd4b3 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ NetBox logo -:loudspeaker: The **[2022 NetBox community survey](https://forms.gle/KR8YbR8GiJ9EYXM28)** is now open! We collect this feedback and demographic data from NetBox users around the world to help shape the project's long-term development goals. Please take a few minutes to share your responses! - ![Master branch build status](https://github.com/netbox-community/netbox/workflows/CI/badge.svg?branch=master) NetBox is an infrastructure resource modeling (IRM) tool designed to empower diff --git a/docs/index.md b/docs/index.md index eadb2088f..81c899387 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,7 +1,5 @@ ![NetBox](netbox_logo.svg "NetBox logo"){style="height: 100px; margin-bottom: 3em"} -:loudspeaker: The **[2022 NetBox community survey](https://forms.gle/KR8YbR8GiJ9EYXM28)** is now open! We collect this feedback and demographic data from NetBox users around the world to help shape the project's long-term development goals. Please take a few minutes to share your responses! - # What is NetBox? NetBox is an infrastructure resource modeling (IRM) application designed to empower network automation. Initially conceived by the network engineering team at [DigitalOcean](https://www.digitalocean.com/), NetBox was developed specifically to address the needs of network and infrastructure engineers. NetBox is made available as open source under the Apache 2 license. It encompasses the following aspects of network management: diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md index 5092d18ed..bab66f2ad 100644 --- a/docs/release-notes/version-3.1.md +++ b/docs/release-notes/version-3.1.md @@ -6,12 +6,15 @@ * [#8163](https://github.com/netbox-community/netbox/issues/8163) - Show bridge interface members under interface view * [#8785](https://github.com/netbox-community/netbox/issues/8785) - Permit wildcard values in IP address DNS names +* [#8790](https://github.com/netbox-community/netbox/issues/8790) - Include site and prefixes columns in VLAN group VLANs table * [#8830](https://github.com/netbox-community/netbox/issues/8830) - Add Checkpoint ClusterXL protocol for FHRP groups * [#8974](https://github.com/netbox-community/netbox/issues/8974) - Use monospace font for text areas in config revision form +* [#9012](https://github.com/netbox-community/netbox/issues/9012) - Linkify circuits count in providers list ### Bug Fixes * [#8866](https://github.com/netbox-community/netbox/issues/8866) - Prevent exception when searching for a rack position with no rack specified under device edit view +* [#9009](https://github.com/netbox-community/netbox/issues/9009) - Fix device count for racks in global search results --- diff --git a/netbox/circuits/tables/providers.py b/netbox/circuits/tables/providers.py index c50610398..e97ade7d8 100644 --- a/netbox/circuits/tables/providers.py +++ b/netbox/circuits/tables/providers.py @@ -24,8 +24,10 @@ class ProviderTable(NetBoxTable): url_params={'provider_id': 'pk'}, verbose_name='ASN Count' ) - circuit_count = tables.Column( + circuit_count = columns.LinkedCountColumn( accessor=Accessor('count_circuits'), + viewname='circuits:circuit_list', + url_params={'provider_id': 'pk'}, verbose_name='Circuits' ) comments = columns.MarkdownColumn() diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 336a6ea72..41bef2527 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -805,7 +805,7 @@ class VLANGroupView(generic.ObjectView): vlans_count = vlans.count() vlans = add_available_vlans(vlans, vlan_group=instance) - vlans_table = tables.VLANTable(vlans, exclude=('site', 'group', 'prefixes')) + vlans_table = tables.VLANTable(vlans, exclude=('group',)) if request.user.has_perm('ipam.change_vlan') or request.user.has_perm('ipam.delete_vlan'): vlans_table.columns.show('pk') vlans_table.configure(request) diff --git a/netbox/netbox/constants.py b/netbox/netbox/constants.py index a9436dfb2..e054dc9da 100644 --- a/netbox/netbox/constants.py +++ b/netbox/netbox/constants.py @@ -67,7 +67,9 @@ DCIM_TYPES = OrderedDict( 'url': 'dcim:site_list', }), ('rack', { - 'queryset': Rack.objects.prefetch_related('site', 'location', 'tenant', 'role'), + 'queryset': Rack.objects.prefetch_related('site', 'location', 'tenant', 'role').annotate( + device_count=count_related(Device, 'rack') + ), 'filterset': RackFilterSet, 'table': RackTable, 'url': 'dcim:rack_list',