Просмотр исходного кода

Fixes #4326: Exclude Python modules without Script classes from scripts list

Jeremy Stretch 6 лет назад
Родитель
Сommit
f9073a2f07
2 измененных файлов с 6 добавлено и 1 удалено
  1. 4 0
      docs/release-notes/version-2.7.md
  2. 2 1
      netbox/extras/scripts.py

+ 4 - 0
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
 * [#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
 * [#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)
 # v2.7.9 (2020-03-06)

+ 2 - 1
netbox/extras/scripts.py

@@ -438,7 +438,8 @@ def get_scripts(use_names=False):
         module_scripts = OrderedDict()
         module_scripts = OrderedDict()
         for name, cls in inspect.getmembers(module, is_script):
         for name, cls in inspect.getmembers(module, is_script):
             module_scripts[name] = cls
             module_scripts[name] = cls
-        scripts[module_name] = module_scripts
+        if module_scripts:
+            scripts[module_name] = module_scripts
 
 
     return scripts
     return scripts