NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-28 03:16:25 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeremy Stretch 2016-11-10 15:30:45 -05:00
parent 00508de55a
commit 0857ce0bf6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/models.py
View File

@ -852,8 +852,7 @@ class Device(CreatedUpdatedModel, CustomFieldModel):
'face': "Must specify rack face when defining rack position." 'face': "Must specify rack face when defining rack position."
}) })
if self.device_type: try:
# Child devices cannot be assigned to a rack face/unit # Child devices cannot be assigned to a rack face/unit
if self.device_type.is_child_device and self.face is not None: if self.device_type.is_child_device and self.face is not None:
raise ValidationError({ raise ValidationError({
@ -880,6 +879,9 @@ class Device(CreatedUpdatedModel, CustomFieldModel):
except Rack.DoesNotExist: except Rack.DoesNotExist:
pass pass
except DeviceType.DoesNotExist:
pass
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
is_new = not bool(self.pk) is_new = not bool(self.pk)