netbox-validity 3.4.2__tar.gz → 3.4.3__tar.gz

{netbox_validity-3.4.2/netbox_validity.egg-info → netbox_validity-3.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.2
+Version: 3.4.3
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License

{netbox_validity-3.4.2 → netbox_validity-3.4.3/netbox_validity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-validity
-Version: 3.4.2
+Version: 3.4.3
 Summary: NetBox plugin for network devices validation
 Author-email: Anton Miasnikov <anton2008m@gmail.com>
 License: MIT License

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-validity"
-version = "3.4.2"
+version = "3.4.3"
 description = "NetBox plugin for network devices validation"
 authors = [
     {name = "Anton Miasnikov", email = "anton2008m@gmail.com"},

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/validity/__init__.py

@@ -16,7 +16,7 @@ class NetBoxValidityConfig(PluginConfig):
     description = "Write and run auto tests for network devices"
     author = "Anton Miasnikov"
     author_email = "anton2008m@gmail.com"
-    version = "3.4.2"
+    version = "3.4.3"
     base_url = "validity"
     django_apps = ["django_bootstrap5"]
     min_version = "4.3.0"

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/validity/netbox_changes/__init__.py

@@ -10,6 +10,10 @@ from strawberry_django import FilterLookup
 from validity import config
 
 
+def get_base_table_kwargs(self):
+    return {"user": self.request.user} if config.netbox_version < "4.5.4" else {}
+
+
 StrFilterLookup = locate("strawberry_django.StrFilterLookup") if config.netbox_version >= "4.5.5" else FilterLookup[str]
 
 if config.netbox_version >= "4.5.0":

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/validity/views/base.py

@@ -13,7 +13,7 @@ from django_tables2 import SingleTableMixin, Table
 from utilities.views import ObjectPermissionRequiredMixin as _ObjectPermissionRequiredMixin
 from utilities.views import ViewTab
 
-from validity import filtersets, forms, models, scripts, tables
+from validity import filtersets, forms, models, netbox_changes, scripts, tables
 from validity.utils.misc import partialcls
 
 
@@ -100,8 +100,7 @@ class TestResultBaseView(ObjectPermissionRequiredMixin, SingleTableMixin, Filter
         table.exclude = (self.result_relation,)
         return table
 
-    def get_table_kwargs(self):
-        return {"user": self.request.user}
+    get_table_kwargs = netbox_changes.get_base_table_kwargs
 
     def get_queryset(self):
         return self.queryset.filter(**{self.result_relation: self.kwargs["pk"]})

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/validity/views/report.py

@@ -8,7 +8,7 @@ from django_tables2 import SingleTableMixin
 from netbox.views import generic
 from utilities.views import ViewTab, register_model_view
 
-from validity import config, filtersets, forms, models, tables
+from validity import filtersets, forms, models, netbox_changes, tables
 from validity.choices import DeviceGroupByChoices, SeverityChoices
 from .base import FilterViewWithForm, ObjectPermissionRequiredMixin, TestResultBaseView
 
@@ -102,8 +102,7 @@ class ReportDeviceView(ObjectPermissionRequiredMixin, SingleTableMixin, FilterVi
         table.configure(self.request)
         return table
 
-    def get_table_kwargs(self):
-        return {"user": self.request.user} if config.netbox_version < "4.5.4" else {}
+    get_table_kwargs = netbox_changes.get_base_table_kwargs
 
     def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return super().get_context_data(**kwargs) | {

{netbox_validity-3.4.2 → netbox_validity-3.4.3}/validity/views/script.py

@@ -12,7 +12,7 @@ from utilities.htmx import htmx_partial
 
 from validity import di
 from validity.forms import RunTestsForm
-from validity.netbox_changes import get_logs
+from validity.netbox_changes import get_base_table_kwargs, get_logs
 from validity.scripts import Launcher, RunTestsParams, ScriptParams
 from validity.tables import ScriptResultTable
 from .base import LauncherMixin
@@ -52,10 +52,12 @@ class ScriptResultView(PermissionRequiredMixin, TableMixin, ObjectView):
 
     def get_table(self, job, request, bulk_actions=False):
         logs = [entry | {"index": i} for i, entry in enumerate(get_logs(job), start=1)]
-        table = self.table_class(logs, user=request.user)
+        table = self.table_class(logs, **self.get_table_kwargs())
         table.configure(request)
         return table
 
+    get_table_kwargs = get_base_table_kwargs
+
     def get(self, request, **kwargs):
         job = self.get_object(**kwargs)
         table = self.get_table(job, request) if job.completed else None