diff --git a/netbox/dcim/ui/panels.py b/netbox/dcim/ui/panels.py index 93043a005..ffa85e90d 100644 --- a/netbox/dcim/ui/panels.py +++ b/netbox/dcim/ui/panels.py @@ -69,7 +69,6 @@ class RackTypePanel(panels.ObjectAttributesPanel): manufacturer = attrs.ObjectAttr('manufacturer', linkify=True) model = attrs.TextAttr('model') description = attrs.TextAttr('description') - airflow = attrs.ChoiceAttr('airflow') class DevicePanel(panels.ObjectAttributesPanel): diff --git a/netbox/utilities/data.py b/netbox/utilities/data.py index 8bd5dcbc6..36fd0f7fc 100644 --- a/netbox/utilities/data.py +++ b/netbox/utilities/data.py @@ -232,5 +232,8 @@ def resolve_attr_path(obj, path): for part in path.split('.'): if cur is None: return None - cur = getattr(cur, part) if hasattr(cur, part) else cur.get(part) + try: + cur = getattr(cur, part) if hasattr(cur, part) else cur.get(part) + except AttributeError: + cur = None return cur