From f9073a2f07e8965d1ff4e5da458d8838d2f3a55f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 6 Mar 2020 20:59:32 -0500 Subject: [PATCH] Fixes #4326: Exclude Python modules without Script classes from scripts list --- docs/release-notes/version-2.7.md | 4 ++++ netbox/extras/scripts.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md index dc32f2a57..576543494 100644 --- a/docs/release-notes/version-2.7.md +++ b/docs/release-notes/version-2.7.md @@ -5,6 +5,10 @@ * [#4323](https://github.com/netbox-community/netbox/issues/4323) - Add bulk edit view for power panels * [#4324](https://github.com/netbox-community/netbox/issues/4324) - Add CSV import view for services +## Bug Fixes + +* [#4326](https://github.com/netbox-community/netbox/issues/4326) - Exclude Python modules without Script classes from scripts list + --- # v2.7.9 (2020-03-06) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 97fc50ea0..e0db71f21 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -438,7 +438,8 @@ def get_scripts(use_names=False): module_scripts = OrderedDict() for name, cls in inspect.getmembers(module, is_script): module_scripts[name] = cls - scripts[module_name] = module_scripts + if module_scripts: + scripts[module_name] = module_scripts return scripts