Merge branch 'develop' into feature

This commit is contained in:
jeremystretch
2023-04-26 15:09:51 -04:00
32 changed files with 378 additions and 43 deletions

View File

@@ -947,7 +947,7 @@ class InventoryItemImportForm(NetBoxModelImportForm):
component_name = self.cleaned_data.get('component_name')
device = self.cleaned_data.get("device")
if not device and hasattr(self, 'instance'):
if not device and hasattr(self, 'instance') and hasattr(self.instance, 'device'):
device = self.instance.device
if not all([device, content_type, component_name]):