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 filtering cables by connected device/rack/site

Browse Source
This commit is contained in:
jeremystretch
2022-05-26 16:01:20 -04:00
parent bd950e9ca6
commit 1bd39e6568
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
netbox/dcim/models/cables.py
View File

@ -116,20 +116,6 @@ class Cable(NetBoxModel):
if b_terminations is not None: if b_terminations is not None:
self.b_terminations = b_terminations self.b_terminations = b_terminations
@classmethod
def from_db(cls, db, field_names, values):
"""
Cache the original A and B terminations of existing Cable instances for later reference inside clean().
"""
instance = super().from_db(db, field_names, values)
# instance._orig_termination_a_type_id = instance.termination_a_type_id
# instance._orig_termination_a_ids = instance.termination_a_ids
# instance._orig_termination_b_type_id = instance.termination_b_type_id
# instance._orig_termination_b_ids = instance.termination_b_ids
return instance
def __str__(self): def __str__(self):
pk = self.pk or self._pk pk = self.pk or self._pk
return self.label or f'#{pk}' return self.label or f'#{pk}'
@ -166,12 +152,11 @@ class Cable(NetBoxModel):
else: else:
self._abs_length = None self._abs_length = None
# TODO: Move to CableTermination # Store the parent Device for the A and B terminations (if applicable) to enable filtering
# # Store the parent Device for the A and B terminations (if applicable) to enable filtering if hasattr(self, 'a_terminations'):
# if hasattr(self.termination_a[0], 'device'): self._termination_a_device = self.a_terminations[0].device
# self._termination_a_device = self.termination_a[0].device if hasattr(self, 'b_terminations'):
# if hasattr(self.termination_b[0], 'device'): self._termination_b_device = self.b_terminations[0].device
# self._termination_b_device = self.termination_b[0].device
super().save(*args, **kwargs) super().save(*args, **kwargs)