NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-19 09:53:34 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

fixes global search when the content type is not found #13507

Browse Source
This commit is contained in:
Abhimanyu Saharan 2023-08-24 18:21:17 +05:30 committed by Jeremy Stretch
parent 08961e751d
commit 1c2cf11f47
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
netbox/utilities/fields.py
View File

@ -103,6 +103,10 @@ class RestrictedGenericForeignKey(GenericForeignKey):
# We avoid looking for values if either ct_id or fkey value is None # We avoid looking for values if either ct_id or fkey value is None
ct_id = getattr(instance, ct_attname) ct_id = getattr(instance, ct_attname)
if ct_id is not None: if ct_id is not None:
# Check if the content type actually exists
if not self.get_content_type(id=ct_id, using=instance._state.db).model_class():
continue
fk_val = getattr(instance, self.fk_field) fk_val = getattr(instance, self.fk_field)
if fk_val is not None: if fk_val is not None:
fk_dict[ct_id].add(fk_val) fk_dict[ct_id].add(fk_val)
@ -127,13 +131,14 @@ class RestrictedGenericForeignKey(GenericForeignKey):
if ct_id is None: if ct_id is None:
return None return None
else: else:
model = self.get_content_type( if model := self.get_content_type(
id=ct_id, using=obj._state.db id=ct_id, using=obj._state.db
).model_class() ).model_class():
return ( return (
model._meta.pk.get_prep_value(getattr(obj, self.fk_field)), model._meta.pk.get_prep_value(getattr(obj, self.fk_field)),
model, model,
) )
return None
return ( return (
ret_val, ret_val,