NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-27 01:36:11 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Catch ImportErrors when rendering report/script lists

Browse Source
This commit is contained in:
jeremystretch 2023-03-29 11:39:29 -04:00
parent 22aaa7d097
commit f4fe7a1f9e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/extras/models/reports.py
View File

@ -51,7 +51,10 @@ class ReportModule(PythonModuleMixin, JobsMixin, ManagedFile):
# For child objects in submodules use the full import path w/o the root module as the name # For child objects in submodules use the full import path w/o the root module as the name
return cls.full_name.split(".", maxsplit=1)[1] return cls.full_name.split(".", maxsplit=1)[1]
try:
module = self.get_module() module = self.get_module()
except ImportError:
return {}
reports = {} reports = {}
ordered = getattr(module, 'report_order', []) ordered = getattr(module, 'report_order', [])

3
netbox/extras/models/scripts.py
View File

@ -51,7 +51,10 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
# For child objects in submodules use the full import path w/o the root module as the name # For child objects in submodules use the full import path w/o the root module as the name
return cls.full_name.split(".", maxsplit=1)[1] return cls.full_name.split(".", maxsplit=1)[1]
try:
module = self.get_module() module = self.get_module()
except ImportError:
return {}
scripts = {} scripts = {}
ordered = getattr(module, 'script_order', []) ordered = getattr(module, 'script_order', [])