NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-09 05:12:18 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Clean up validation logic

Browse Source
This commit is contained in:
Jeremy Stretch
2025-12-12 11:48:51 -05:00
parent 7d945b24cb
commit c1c912d84b
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,18 +220,31 @@ class CabledObjectModel(models.Model):
raise ValidationError({ raise ValidationError({
"cable_end": _("Must specify cable end (A or B) when attaching a cable.") "cable_end": _("Must specify cable end (A or B) when attaching a cable.")
}) })
if self.cable_end and not self.cable: if self.cable_connector and not self.cable_positions:
raise ValidationError({
"cable_positions": _("Must specify position(s) when specifying a cable connector.")
})
if self.cable_positions and not self.cable_connector:
raise ValidationError({
"cable_positions": _("Cable positions cannot be set without a cable connector.")
})
if self.mark_connected:
raise ValidationError({
"mark_connected": _("Cannot mark as connected with a cable attached.")
})
else:
if self.cable_end:
raise ValidationError({ raise ValidationError({
"cable_end": _("Cable end must not be set without a cable.") "cable_end": _("Cable end must not be set without a cable.")
}) })
if self.cable_positions and not self.cable: if self.cable_connector:
raise ValidationError({
"cable_connector": _("Cable connector must not be set without a cable.")
})
if self.cable_positions:
raise ValidationError({ raise ValidationError({
"cable_positions": _("Cable termination positions must not be set without a cable.") "cable_positions": _("Cable termination positions must not be set without a cable.")
}) })
if self.mark_connected and self.cable:
raise ValidationError({
"mark_connected": _("Cannot mark as connected with a cable attached.")
})
@property @property
def link(self): def link(self):