Răsfoiți Sursa

Closes #18024: Add URL pattern for scripts to reference them by module.name (#18723)

* Add URL pattern for scripts to reference them by module.name

* Change _get_script function name and syntax

* Fix formatting issue
atownson 11 luni în urmă
părinte
comite
48b825c64a
2 a modificat fișierele cu 11 adăugiri și 0 ștergeri
  1. 3 0
      netbox/extras/urls.py
  2. 8 0
      netbox/extras/views.py

+ 3 - 0
netbox/extras/urls.py

@@ -75,8 +75,11 @@ urlpatterns = [
     path('scripts/add/', views.ScriptModuleCreateView.as_view(), name='scriptmodule_add'),
     path('scripts/results/<int:job_pk>/', views.ScriptResultView.as_view(), name='script_result'),
     path('scripts/<int:pk>/', views.ScriptView.as_view(), name='script'),
+    path('scripts/<str:module>.<str:name>/', views.ScriptView.as_view(), name='script'),
     path('scripts/<int:pk>/source/', views.ScriptSourceView.as_view(), name='script_source'),
+    path('scripts/<str:module>.<str:name>/source/', views.ScriptSourceView.as_view(), name='script_source'),
     path('scripts/<int:pk>/jobs/', views.ScriptJobsView.as_view(), name='script_jobs'),
+    path('scripts/<str:module>.<str:name>/jobs/', views.ScriptJobsView.as_view(), name='script_jobs'),
     path('script-modules/<int:pk>/', include(get_model_urls('extras', 'scriptmodule'))),
 
     # Markdown

+ 8 - 0
netbox/extras/views.py

@@ -1251,6 +1251,14 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
 class BaseScriptView(generic.ObjectView):
     queryset = Script.objects.all()
 
+    def get_object(self, **kwargs):
+        if pk := kwargs.get('pk', False):
+            return get_object_or_404(self.queryset, pk=pk)
+        elif (module := kwargs.get('module')) and (name := kwargs.get('name', False)):
+            return get_object_or_404(self.queryset, module__file_path=f'{module}.py', name=name)
+        else:
+            raise Http404
+
     def _get_script_class(self, script):
         """
         Return an instance of the Script's Python class