NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-10 01:28:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

14948 make singular

Browse Source
This commit is contained in:
Arthur 2024-05-21 12:00:31 -07:00
parent 581560fa8a
commit ecb02ec939
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/dcim/filtersets.py
View File

@ -1100,9 +1100,9 @@ class DeviceFilterSet(
queryset=IPAddress.objects.all(), queryset=IPAddress.objects.all(),
label=_('OOB IP (ID)'), label=_('OOB IP (ID)'),
) )
has_virtual_device_contexts = django_filters.BooleanFilter( has_virtual_device_context = django_filters.BooleanFilter(
method='_has_virtual_device_contexts', method='_has_virtual_device_context',
label=_('Has virtual device contexts'), label=_('Has virtual device context'),
) )
class Meta: class Meta:
@ -1180,7 +1180,7 @@ class DeviceFilterSet(
def _device_bays(self, queryset, name, value): def _device_bays(self, queryset, name, value):
return queryset.exclude(devicebays__isnull=value) return queryset.exclude(devicebays__isnull=value)
def _has_virtual_device_contexts(self, queryset, name, value): def _has_virtual_device_context(self, queryset, name, value):
params = Q(vdcs__isnull=False) params = Q(vdcs__isnull=False)
if value: if value:
return queryset.filter(params).distinct() return queryset.filter(params).distinct()

4
netbox/dcim/forms/filtersets.py
View File

@ -657,7 +657,7 @@ class DeviceFilterForm(
), ),
FieldSet( FieldSet(
'has_primary_ip', 'has_oob_ip', 'virtual_chassis_member', 'config_template_id', 'local_context_data', 'has_primary_ip', 'has_oob_ip', 'virtual_chassis_member', 'config_template_id', 'local_context_data',
'has_virtual_device_contexts', 'has_virtual_device_context',
name=_('Miscellaneous') name=_('Miscellaneous')
) )
) )
@ -814,7 +814,7 @@ class DeviceFilterForm(
choices=BOOLEAN_WITH_BLANK_CHOICES choices=BOOLEAN_WITH_BLANK_CHOICES
) )
) )
has_virtual_device_contexts = forms.NullBooleanField( has_virtual_device_context = forms.NullBooleanField(
required=False, required=False,
label=_('Has virtual device contexts'), label=_('Has virtual device contexts'),
widget=forms.Select( widget=forms.Select(