From b305458b25e72061f5122da6722868eecd24b9e3 Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Mon, 23 Sep 2024 11:53:00 -0700
Subject: [PATCH] 17501 fix showing last run of script job execution in list
 view

---
 netbox/netbox/models/features.py         | 7 +------
 netbox/templates/extras/script_list.html | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index 45eb70081..d0ca2c8d3 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -410,12 +410,7 @@ class JobsMixin(models.Model):
         """
         Return a dictionary mapping of the most recent jobs for this instance.
         """
-        return {
-            job.name: job
-            for job in self.jobs.filter(
-                status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
-            ).order_by('name', '-created').distinct('name').defer('data')
-        }
+        return self.jobs.filter(status__in=JobStatusChoices.TERMINAL_STATE_CHOICES).order_by('-created').defer('data')
 
 
 class JournalingMixin(models.Model):
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 4699e2c09..5b7361a12 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -50,7 +50,7 @@
           </thead>
           <tbody>
             {% for script in module.scripts.all %}
-              {% with last_job=script.get_latest_jobs|get_key:script.name %}
+              {% with last_job=script.get_latest_jobs|first %}
                 <tr>
                   <td>
                     {% if script.is_executable %}