NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-20 02:06:42 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes #1786: Correct loading of reports from a custom file path

Browse Source
This commit is contained in:
Jeremy Stretch 2018-07-31 13:48:07 -04:00
parent d4ccaf60cf
commit 5f7e21faa0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/reports.py
View File

@ -46,8 +46,8 @@ def get_reports():
# Iterate through all modules within the reports path. These are the user-created files in which reports are
# defined.
for importer, module_name, is_pkg in pkgutil.walk_packages([settings.REPORTS_ROOT]):
module = importlib.import_module('reports.{}'.format(module_name))
for importer, module_name, _ in pkgutil.iter_modules([settings.REPORTS_ROOT]):
module = importer.find_module(module_name).load_module(module_name)
report_list = [cls() for _, cls in inspect.getmembers(module, is_report)]
module_list.append((module_name, report_list))
@ -104,7 +104,7 @@ class Report(object):
@property
def module(self):
return self.__module__.rsplit('.', 1)[1]
return self.__module__
@property
def name(self):