NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-18 05:28:16 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

12510 merge report into script view

Browse Source
This commit is contained in:
Arthur 2024-01-26 09:31:27 -08:00
parent 32678b3c4b
commit c69205535e
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,13 @@ import logging
from functools import cached_property from functools import cached_property
from django.db import models from django.db import models
from django.db.models import Q
from django.urls import reverse from django.urls import reverse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from core.choices import ManagedFileRootPathChoices from core.choices import ManagedFileRootPathChoices
from core.models import ManagedFile from core.models import ManagedFile
from extras.utils import is_script from extras.utils import is_script_or_report
from netbox.models.features import JobsMixin, EventRulesMixin from netbox.models.features import JobsMixin, EventRulesMixin
from utilities.querysets import RestrictedQuerySet from utilities.querysets import RestrictedQuerySet
from .mixins import PythonModuleMixin from .mixins import PythonModuleMixin
@ -32,7 +33,8 @@ class Script(EventRulesMixin, models.Model):
class ScriptModuleManager(models.Manager.from_queryset(RestrictedQuerySet)): class ScriptModuleManager(models.Manager.from_queryset(RestrictedQuerySet)):
def get_queryset(self): def get_queryset(self):
return super().get_queryset().filter(file_root=ManagedFileRootPathChoices.SCRIPTS) return super().get_queryset().filter(
Q(file_root=ManagedFileRootPathChoices.SCRIPTS) | Q(file_root=ManagedFileRootPathChoices.REPORTS))
class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile): class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
@ -70,7 +72,7 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
for cls in ordered: for cls in ordered:
scripts[_get_name(cls)] = cls scripts[_get_name(cls)] = cls
for name, cls in inspect.getmembers(module, is_script): for name, cls in inspect.getmembers(module, is_script_or_report):
if cls not in ordered: if cls not in ordered:
scripts[_get_name(cls)] = cls scripts[_get_name(cls)] = cls

12
netbox/extras/utils.py
View File

@ -67,3 +67,15 @@ def is_report(obj):
return issubclass(obj, Report) and obj != Report return issubclass(obj, Report) and obj != Report
except TypeError: except TypeError:
return False return False
def is_script_or_report(obj):
"""
Returns True if the given object is a Report.
"""
from .reports import Report
from .scripts import Script
try:
return ((issubclass(obj, Report) and obj != Report) or (issubclass(obj, Script) and obj != Script))
except TypeError:
return False