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

Merge branch 'develop' into develop-2.6

Browse Source
This commit is contained in:
Jeremy Stretch
2019-04-02 13:12:34 -04:00
parent 0b95016e00 7c6d2a6281
commit c8cccc30d1
24 changed files with 121 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/models.py
View File

@ -722,7 +722,7 @@ class ConfigContextModel(models.Model):
data = deepmerge(data, context.data)
# If the object has local config context data defined, merge it last
if self.local_context_data is not None:
if self.local_context_data:
data = deepmerge(data, self.local_context_data)
return data