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

Fixed Cable model validation

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-01 11:54:15 -04:00
parent 903dfb6f07
commit 105f9365bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/models.py
View File

@ -2438,11 +2438,11 @@ class Cable(ChangeLoggedModel):
))
# Check for an existing Cable connected to either termination object
if self.termination_a.cable is not None:
if self.termination_a.cable not in (None, self):
raise ValidationError("{} already has a cable attached (#{})".format(
self.termination_a, self.termination_a.cable_id
))
if self.termination_b.cable is not None:
if self.termination_b.cable not in (None, self):
raise ValidationError("{} already has a cable attached (#{})".format(
self.termination_b, self.termination_b.cable_id
))
@ -2451,7 +2451,7 @@ class Cable(ChangeLoggedModel):
if self.length and not self.length_unit:
raise ValidationError("Must specify a unit when setting a cable length")
if self.length_unit and self.length is None:
self.length_unit = None
self.length_unit = ''
def save(self, *args, **kwargs):