Merge branch 'develop' into develop-2.8

2020-03-10 15:06:37 -04:00
parent 803287a514 55558cb272
commit 0de857bf7a
156 changed files with 1561 additions and 1674 deletions
--- a/netbox/extras/scripts.py
+++ b/netbox/extras/scripts.py
@@ -451,7 +451,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