Fixes #678: Server error on device import specifying an invalid device type

This commit is contained in:
Jeremy Stretch 2016-11-10 15:30:45 -05:00
parent 7dfd32a5c4
commit 07e34fbe84

View File

@ -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)