From 0857ce0bf6b5922ce67737ddb5d76053be032e36 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 10 Nov 2016 15:30:45 -0500 Subject: [PATCH] Fixes #678: Server error on device import specifying an invalid device type --- netbox/dcim/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py index b20f22940..93cdb95d5 100644 --- a/netbox/dcim/models.py +++ b/netbox/dcim/models.py @@ -852,8 +852,7 @@ class Device(CreatedUpdatedModel, CustomFieldModel): 'face': "Must specify rack face when defining rack position." }) - if self.device_type: - + try: # Child devices cannot be assigned to a rack face/unit if self.device_type.is_child_device and self.face is not None: raise ValidationError({ @@ -880,6 +879,9 @@ class Device(CreatedUpdatedModel, CustomFieldModel): except Rack.DoesNotExist: pass + except DeviceType.DoesNotExist: + pass + def save(self, *args, **kwargs): is_new = not bool(self.pk)