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

Fixes #14572 - Constrains JobView (and related views) badge to specific named job

Browse Source
This commit is contained in:
Daniel Sheppard 2024-01-09 11:57:07 -06:00
parent e1e198ec4f
commit 8a140009d0
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
netbox/extras/views.py
View File

@ -1224,6 +1224,19 @@ def get_script_module(module, request):
return get_object_or_404(ScriptModule.objects.restrict(request.user), file_path__regex=f"^{module}\\.") return get_object_or_404(ScriptModule.objects.restrict(request.user), file_path__regex=f"^{module}\\.")
# Return jobs filtered for job model type (Example: `scriptmodule`)
def get_jobs(module, script, jobtype):
# Check if it is a supported module. Return an empty queryset if not
object_type = ContentType.objects.get(app_label='extras', model=jobtype)
jobs = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=script.class_name,
)
return jobs
class ScriptView(ContentTypePermissionRequiredMixin, View): class ScriptView(ContentTypePermissionRequiredMixin, View):
def get_required_permission(self): def get_required_permission(self):
@ -1233,18 +1246,15 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
module = get_script_module(module, request) module = get_script_module(module, request)
script = module.scripts[name]() script = module.scripts[name]()
form = script.as_form(initial=normalize_querydict(request.GET)) form = script.as_form(initial=normalize_querydict(request.GET))
jobs = get_jobs(module, script, 'scriptmodule')
# Look for a pending Job (use the latest one by creation timestamp) # Look for a pending Job (use the latest one by creation timestamp)
object_type = ContentType.objects.get(app_label='extras', model='scriptmodule') script.result = jobs.exclude(
script.result = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=script.name,
).exclude(
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).first() ).first()
return render(request, 'extras/script.html', { return render(request, 'extras/script.html', {
'jobs': jobs,
'module': module, 'module': module,
'script': script, 'script': script,
'form': form, 'form': form,
@ -1279,6 +1289,7 @@ class ScriptView(ContentTypePermissionRequiredMixin, View):
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', {
'jobs': get_jobs(module, script, 'scriptmodule'),
'module': module, 'module': module,
'script': script, 'script': script,
'form': form, 'form': form,
@ -1295,6 +1306,7 @@ class ScriptSourceView(ContentTypePermissionRequiredMixin, View):
script = module.scripts[name]() script = module.scripts[name]()
return render(request, 'extras/script/source.html', { return render(request, 'extras/script/source.html', {
'jobs': get_jobs(module, script, 'scriptmodule'),
'module': module, 'module': module,
'script': script, 'script': script,
'tab': 'source', 'tab': 'source',
@ -1309,13 +1321,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
def get(self, request, module, name): def get(self, request, module, name):
module = get_script_module(module, request) module = get_script_module(module, request)
script = module.scripts[name]() script = module.scripts[name]()
jobs = get_jobs(module, script, 'scriptmodule')
object_type = ContentType.objects.get(app_label='extras', model='scriptmodule')
jobs = Job.objects.filter(
object_type=object_type,
object_id=module.pk,
name=script.class_name
)
jobs_table = JobTable( jobs_table = JobTable(
data=jobs, data=jobs,
@ -1325,6 +1331,7 @@ class ScriptJobsView(ContentTypePermissionRequiredMixin, View):
jobs_table.configure(request) jobs_table.configure(request)
return render(request, 'extras/script/jobs.html', { return render(request, 'extras/script/jobs.html', {
'jobs': jobs,
'module': module, 'module': module,
'script': script, 'script': script,
'table': jobs_table, 'table': jobs_table,

2
netbox/templates/extras/script/base.html
View File

@ -33,7 +33,7 @@
</li> </li>
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:script_jobs' module=script.module name=script.class_name %}"> <a class="nav-link{% if tab == 'jobs' %} active{% endif %}" href="{% url 'extras:script_jobs' module=script.module name=script.class_name %}">
{% trans "Jobs" %} {% badge module.jobs.count %} {% trans "Jobs" %} {% badge jobs.count %}
</a> </a>
</li> </li>
</ul> </ul>