From 498f132cadcfadafb11ff8a2882734c4e8ecec4d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 28 Mar 2019 10:16:28 -0400 Subject: [PATCH] Fixes #3027: Ignore empty local context data when rendering config contexts --- CHANGELOG.md | 1 + netbox/extras/models.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a69780d3f..9cb11f667 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ v2.5.9 (FUTURE) * [#3014](https://github.com/digitalocean/netbox/issues/3014) - Fixes VM Role filtering * [#3022](https://github.com/digitalocean/netbox/issues/3022) - Add missing cable termination types to DCIM `_choices` endpoint * [#3026](https://github.com/digitalocean/netbox/issues/3026) - Tweak prefix/IP filter forms to filter using VRF ID rather than route distinguisher +* [#3027](https://github.com/digitalocean/netbox/issues/3027) - Ignore empty local context data when rendering config contexts v2.5.8 (2019-03-11) diff --git a/netbox/extras/models.py b/netbox/extras/models.py index 1b106a62a..ad31c3821 100644 --- a/netbox/extras/models.py +++ b/netbox/extras/models.py @@ -720,7 +720,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