mirror of
https://github.com/netbox-community/netbox.git
synced 2024-05-10 07:54:54 +00:00
fixes global search when the content type is not found #13507
This commit is contained in:
committed by
Jeremy Stretch
parent
08961e751d
commit
1c2cf11f47
@ -103,6 +103,10 @@ class RestrictedGenericForeignKey(GenericForeignKey):
|
||||
# We avoid looking for values if either ct_id or fkey value is None
|
||||
ct_id = getattr(instance, ct_attname)
|
||||
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)
|
||||
if fk_val is not None:
|
||||
fk_dict[ct_id].add(fk_val)
|
||||
@ -127,13 +131,14 @@ class RestrictedGenericForeignKey(GenericForeignKey):
|
||||
if ct_id is None:
|
||||
return None
|
||||
else:
|
||||
model = self.get_content_type(
|
||||
if model := self.get_content_type(
|
||||
id=ct_id, using=obj._state.db
|
||||
).model_class()
|
||||
).model_class():
|
||||
return (
|
||||
model._meta.pk.get_prep_value(getattr(obj, self.fk_field)),
|
||||
model,
|
||||
)
|
||||
return None
|
||||
|
||||
return (
|
||||
ret_val,
|
||||
|
Reference in New Issue
Block a user