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

Merge branch 'develop' into 18136-script-branch

Browse Source
This commit is contained in:
Arthur Hanson 2024-12-02 13:29:20 -08:00
commit 768d89734c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/extras/views.py
View File

@ -1141,12 +1141,14 @@ class ScriptView(BaseScriptView):
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', {
'object': script,
'script': script, 'script': script,
}) })
form = script_class.as_form(initial=normalize_querydict(request.GET)) form = script_class.as_form(initial=normalize_querydict(request.GET))
return render(request, 'extras/script.html', { return render(request, 'extras/script.html', {
'object': script,
'script': script, 'script': script,
'script_class': script_class, 'script_class': script_class,
'form': form, 'form': form,
@ -1162,6 +1164,7 @@ class ScriptView(BaseScriptView):
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', {
'object': script,
'script': script, 'script': script,
}) })
@ -1186,6 +1189,7 @@ class ScriptView(BaseScriptView):
return redirect('extras:script_result', job_pk=job.pk) return redirect('extras:script_result', job_pk=job.pk)
return render(request, 'extras/script.html', { return render(request, 'extras/script.html', {
'object': script,
'script': script, 'script': script,
'script_class': script.python_class(), 'script_class': script.python_class(),
'form': form, 'form': form,