From e5bf33fc47e2e4bf6deb0cff66e96668bcb758e4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 19 Jun 2025 13:10:10 -0400 Subject: [PATCH] Simplify conditional logic; tweak timestamp format --- netbox/extras/views.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 6939c19bf..ea465a4a4 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1476,18 +1476,17 @@ class ScriptResultView(TableMixin, generic.ObjectView): table = None job = get_object_or_404(Job.objects.all(), pk=kwargs.get('job_pk')) - if job.completed: - table = self.get_table(job, request, bulk_actions=False) + # If a direct export output has been requested, return the job data content as a + # downloadable file. + if job.completed and request.GET.get('export') == 'output': + content = (job.data.get("output") or "").encode() + response = HttpResponse(content, content_type='text') + filename = f"{job.object.name or 'script-output'}_{job.completed.strftime('%Y-%m-%d_%H%M%S')}.txt" + response['Content-Disposition'] = f'attachment; filename="{filename}"' + return response - if job.completed: - # If a direct export output has been requested, return the job data content as a - # downloadable file. - if request.GET.get('export') == 'output': - content = (job.data.get("output") or "").encode() - response = HttpResponse(content, content_type='text') - filename = f"{job.object.name or 'script-output'}_{job.completed.strftime('%Y-%m-%d-%H-%M-%S')}.txt" - response['Content-Disposition'] = f'attachment; filename="{filename}"' - return response + elif job.completed: + table = self.get_table(job, request, bulk_actions=False) log_threshold = request.GET.get('log_threshold', LogLevelChoices.LOG_INFO) if log_threshold not in LOG_LEVEL_RANK: