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

Fixes #3709: Prevent exception when importing an invalid cable definition

Browse Source
This commit is contained in:
Jeremy Stretch
2019-11-26 16:46:51 -05:00
parent 6a451e0c0e
commit 1d18948307
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.6.md
View File

@ -12,6 +12,7 @@
* [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form * [#3669](https://github.com/netbox-community/netbox/issues/3669) - Include `weight` field in prefix/VLAN role form
* [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view * [#3674](https://github.com/netbox-community/netbox/issues/3674) - Include comments on PowerFeed view
* [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page * [#3679](https://github.com/netbox-community/netbox/issues/3679) - Fix link for assigned ipaddress in interface page
* [#3709](https://github.com/netbox-community/netbox/issues/3709) - Prevent exception when importing an invalid cable definition
# v2.6.7 (2019-11-01) # v2.6.7 (2019-11-01)

4
netbox/dcim/models.py
View File

@ -2838,6 +2838,8 @@ class Cable(ChangeLoggedModel):
def clean(self): def clean(self):
# Validate that termination A exists # Validate that termination A exists
if not hasattr(self, 'termination_a_type'):
raise ValidationError('Termination A type has not been specified')
try: try:
self.termination_a_type.model_class().objects.get(pk=self.termination_a_id) self.termination_a_type.model_class().objects.get(pk=self.termination_a_id)
except ObjectDoesNotExist: except ObjectDoesNotExist:
@ -2846,6 +2848,8 @@ class Cable(ChangeLoggedModel):
}) })
# Validate that termination B exists # Validate that termination B exists
if not hasattr(self, 'termination_b_type'):
raise ValidationError('Termination B type has not been specified')
try: try:
self.termination_b_type.model_class().objects.get(pk=self.termination_b_id) self.termination_b_type.model_class().objects.get(pk=self.termination_b_id)
except ObjectDoesNotExist: except ObjectDoesNotExist: