NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Rename is_occupied to occupied

Browse Source
This commit is contained in:
jeremystretch 2022-09-12 16:42:04 -04:00
parent d24f10ce6e
commit 57365ef7b9
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/circuits/tests/test_filtersets.py
View File

@ -411,10 +411,10 @@ class CircuitTerminationTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'connected': False} params = {'connected': False}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 10) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 10)
def test_is_occupied(self): def test_occupied(self):
params = {'is_occupied': True} params = {'occupied': True}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
params = {'is_occupied': False} params = {'occupied': False}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 7)

6
netbox/dcim/filtersets.py
View File

@ -1144,11 +1144,11 @@ class CabledObjectFilterSet(django_filters.FilterSet):
lookup_expr='isnull', lookup_expr='isnull',
exclude=True exclude=True
) )
is_occupied = django_filters.BooleanFilter( occupied = django_filters.BooleanFilter(
method='filter_is_occupied' method='filter_occupied'
) )
def filter_is_occupied(self, queryset, name, value): def filter_occupied(self, queryset, name, value):
if value: if value:
return queryset.filter(Q(cable__isnull=False) | Q(mark_connected=True)) return queryset.filter(Q(cable__isnull=False) | Q(mark_connected=True))
else: else:

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

@ -1013,7 +1013,7 @@ class CabledFilterForm(forms.Form):
choices=BOOLEAN_WITH_BLANK_CHOICES choices=BOOLEAN_WITH_BLANK_CHOICES
) )
) )
is_occupied = forms.NullBooleanField( occupied = forms.NullBooleanField(
required=False, required=False,
widget=StaticSelect( widget=StaticSelect(
choices=BOOLEAN_WITH_BLANK_CHOICES choices=BOOLEAN_WITH_BLANK_CHOICES
@ -1030,7 +1030,7 @@ class InterfaceFilterForm(CabledFilterForm, DeviceComponentFilterForm):
('PoE', ('poe_mode', 'poe_type')), ('PoE', ('poe_mode', 'poe_type')),
('Wireless', ('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power')), ('Wireless', ('rf_role', 'rf_channel', 'rf_channel_width', 'tx_power')),
('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')), ('Device', ('region_id', 'site_group_id', 'site_id', 'location_id', 'rack_id', 'virtual_chassis_id', 'device_id')),
('Connection', ('cabled', 'connected', 'is_occupied')) ('Connection', ('cabled', 'connected', 'occupied'))
) )
kind = MultipleChoiceField( kind = MultipleChoiceField(
choices=InterfaceKindChoices, choices=InterfaceKindChoices,

6
netbox/dcim/tests/test_filtersets.py
View File

@ -2885,10 +2885,10 @@ class InterfaceTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'connected': False} params = {'connected': False}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
def test_is_occupied(self): def test_occupied(self):
params = {'is_occupied': True} params = {'occupied': True}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
params = {'is_occupied': False} params = {'occupied': False}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
def test_kind(self): def test_kind(self):