mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

account for null value annotations

Browse Source
This commit is contained in:
John Anderson
2020-10-23 10:56:02 -04:00
parent 22d2289ed2
commit 82f5d0070e
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/extras/models/models.py
View File

@@ -543,7 +543,14 @@ class ConfigContextModel(models.Model):
# Compile all config data, overwriting lower-weight values with higher-weight values where a collision occurs
data = OrderedDict()
for context in self.config_context_data:
if not hasattr(self, 'config_context_data'):
# The annotation is not available, so we fall back to manually querying for the config context objects
config_context_data = ConfigContext.objects.get_for_object(self, aggregate_data=True)
else:
# The attribute may exist, but the annotated value could be None if there is no config context data
config_context_data = self.config_context_data or []
for context in config_context_data:
data = deepmerge(data, context)
# If the object has local config context data defined, merge it last