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

Fix PowerPort connected_endpoint filtering, ordering

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-25 15:06:48 -04:00
parent e1bca52d57
commit 2c730b08e4
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/api/serializers.py
View File

@ -429,8 +429,8 @@ class PowerPortSerializer(TaggitSerializer, ConnectedEndpointSerializer):
class Meta:
model = PowerPort
fields = [
'id', 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type', 'connected_endpoint', 'connection_status',
'cable', 'tags',
'id', 'device', 'name', 'maximum_draw', 'allocated_draw', 'description', 'connected_endpoint_type',
'connected_endpoint', 'connection_status', 'cable', 'tags',
]

4
netbox/dcim/filters.py
View File

@ -1025,14 +1025,14 @@ class PowerConnectionFilter(django_filters.FilterSet):
def filter_site(self, queryset, name, value):
if not value.strip():
return queryset
return queryset.filter(connected_endpoint__device__site__slug=value)
return queryset.filter(_connected_poweroutlet__device__site__slug=value)
def filter_device(self, queryset, name, value):
if not value.strip():
return queryset
return queryset.filter(
Q(device__name__icontains=value) |
Q(connected_endpoint__device__name__icontains=value)
Q(_connected_poweroutlet__device__name__icontains=value)
)

5
netbox/dcim/tables.py
View File

@ -707,7 +707,8 @@ class PowerConnectionTable(BaseTable):
args=[Accessor('connected_endpoint.device.pk')],
verbose_name='PDU'
)
connected_endpoint = tables.Column(
outlet = tables.Column(
accessor=Accessor('_connected_poweroutlet'),
verbose_name='Outlet'
)
device = tables.LinkColumn(
@ -720,7 +721,7 @@ class PowerConnectionTable(BaseTable):
class Meta(BaseTable.Meta):
model = PowerPort
fields = ('pdu', 'connected_endpoint', 'device', 'name', 'connection_status')
fields = ('pdu', 'outlet', 'device', 'name', 'connection_status')
class InterfaceConnectionTable(BaseTable):