NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix missing component_name issue

Browse Source
This commit is contained in:
Renato Almeida de Oliveira Zaroubin 2025-03-19 00:21:43 +00:00
parent ef9886b618
commit d327147ccf
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/dcim/forms/bulk_import.py
View File

@ -1164,15 +1164,15 @@ class InventoryItemImportForm(NetBoxModelImportForm):
def clean(self):
super().clean()
cleaned_data = self.cleaned_data
component_type = cleaned_data.get('component_type')
component_name = cleaned_data.get('component_name')
component_type = cleaned_data.get('component_type', None)
component_name = cleaned_data.get('component_name', None)
device = self.cleaned_data.get("device")
if component_type:
if device is None:
cleaned_data.pop('component_type')
cleaned_data.pop('component_type', None)
if component_name is None:
cleaned_data.pop('component_type')
cleaned_data.pop('component_type', None)
raise forms.ValidationError(
_("Component name must be specified when component type is specified")
)
@ -1181,13 +1181,19 @@ class InventoryItemImportForm(NetBoxModelImportForm):
model = component_type.model_class()
self.instance.component = model.objects.get(device=device, name=component_name)
except ObjectDoesNotExist:
cleaned_data.pop('component_type')
cleaned_data.pop('component_name')
cleaned_data.pop('component_type', None)
cleaned_data.pop('component_name', None)
raise forms.ValidationError(
_("Component not found: {device} - {component_name}").format(
device=device, component_name=component_name
)
)
else:
cleaned_data.pop('component_type', None)
if not component_name:
raise forms.ValidationError(
_("Component name must be specified when component type is specified")
)
else:
if component_name:
raise forms.ValidationError(