mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2023-03-13 11:58:37 -04:00
parent a717ddf5e6 520493c714
commit 2a9178af12
63 changed files with 502 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/virtualization/filtersets.py
View File

@@ -238,7 +238,9 @@ class VirtualMachineFilterSet(
return queryset
return queryset.filter(
Q(name__icontains=value) |
Q(comments__icontains=value)
Q(comments__icontains=value) |
Q(primary_ip4__address__startswith=value) |
Q(primary_ip6__address__startswith=value)
)
def _has_primary_ip(self, queryset, name, value):

2
netbox/virtualization/forms/bulk_edit.py
View File

@@ -89,7 +89,6 @@ class ClusterBulkEditForm(NetBoxModelBulkEditForm):
required=False
)
comments = CommentField(
widget=forms.Textarea,
label=_('Comments')
)
@@ -161,7 +160,6 @@ class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
required=False
)
comments = CommentField(
widget=forms.Textarea,
label=_('Comments')
)