NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-15 00:02:17 -06:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-08-29 10:51:38 -04:00
parent 91df0c0686 31f167d0f9
commit 6f7bf5baf4
90 changed files with 6941 additions and 7075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/views.py
View File

@@ -380,7 +380,9 @@ class SiteGroupContactsView(ObjectContactsView):
#
class SiteListView(generic.ObjectListView):
queryset = Site.objects.all()
queryset = Site.objects.annotate(
device_count=count_related(Device, 'site')
)
filterset = filtersets.SiteFilterSet
filterset_form = forms.SiteFilterForm
table = tables.SiteTable
@@ -3505,7 +3507,7 @@ class VirtualChassisAddMemberView(ObjectPermissionRequiredMixin, GetReturnURLMix
membership_form.save()
messages.success(request, mark_safe(
_('Added member <a href="{url}">{escape(device)}</a>').format(url=device.get_absolute_url())
_('Added member <a href="{url}">{device}</a>').format(url=device.get_absolute_url(), device=escape(device))
))
if '_addanother' in request.POST: