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

Change _get_script function name and syntax

Browse Source
This commit is contained in:
atownson 2025-02-24 15:03:36 -06:00
parent dc9d54c3c1
commit 71fc4743eb
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/extras/views.py
View File

@ -1251,16 +1251,12 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
class BaseScriptView(generic.ObjectView): class BaseScriptView(generic.ObjectView):
queryset = Script.objects.all() queryset = Script.objects.all()
def _get_script(self, **kwargs): def get_object(self, **kwargs):
if 'pk' in kwargs: if pk := kwargs.get('pk', False):
pk = kwargs.get('pk')
return get_object_or_404(self.queryset, pk=pk) return get_object_or_404(self.queryset, pk=pk)
elif 'module' in kwargs and 'name' in kwargs: elif (module := kwargs.get('module')) and (name := kwargs.get('name', False)):
module = kwargs.get('module')
name = kwargs.get('name')
return get_object_or_404(self.queryset, module__file_path=f'{module}.py', name=name) return get_object_or_404(self.queryset, module__file_path=f'{module}.py', name=name)
else: else: raise Http404
raise Http404
def _get_script_class(self, script): def _get_script_class(self, script):
""" """
@ -1273,7 +1269,7 @@ class BaseScriptView(generic.ObjectView):
class ScriptView(BaseScriptView): class ScriptView(BaseScriptView):
def get(self, request, **kwargs): def get(self, request, **kwargs):
script = self._get_script(**kwargs) script = self.get_object(**kwargs)
script_class = self._get_script_class(script) script_class = self._get_script_class(script)
if not script_class: if not script_class:
return render(request, 'extras/script.html', { return render(request, 'extras/script.html', {
@ -1292,7 +1288,7 @@ class ScriptView(BaseScriptView):
}) })
def post(self, request, **kwargs): def post(self, request, **kwargs):
script = self._get_script(**kwargs) script = self.get_object(**kwargs)
if not request.user.has_perm('extras.run_script', obj=script): if not request.user.has_perm('extras.run_script', obj=script):
return HttpResponseForbidden() return HttpResponseForbidden()
@ -1337,7 +1333,7 @@ class ScriptSourceView(BaseScriptView):
queryset = Script.objects.all() queryset = Script.objects.all()
def get(self, request, **kwargs): def get(self, request, **kwargs):
script = self._get_script(**kwargs) script = self.get_object(**kwargs)
script_class = self._get_script_class(script) script_class = self._get_script_class(script)
return render(request, 'extras/script/source.html', { return render(request, 'extras/script/source.html', {
@ -1352,7 +1348,7 @@ class ScriptJobsView(BaseScriptView):
queryset = Script.objects.all() queryset = Script.objects.all()
def get(self, request, **kwargs): def get(self, request, **kwargs):
script = self._get_script(**kwargs) script = self.get_object(**kwargs)
jobs_table = JobTable( jobs_table = JobTable(
data=script.jobs.all(), data=script.jobs.all(),