Просмотр исходного кода

17501 fix showing last run of script execution in list view (#17581)

* 17501 fix showing last run of script job execution in list view

* 17501 fix showing last run of script job execution in list view
Arthur Hanson 1 год назад
Родитель
Сommit
9c9c4fbd6e
2 измененных файлов с 3 добавлено и 8 удалено
  1. 2 7
      netbox/netbox/models/features.py
  2. 1 1
      netbox/templates/extras/script_list.html

+ 2 - 7
netbox/netbox/models/features.py

@@ -408,14 +408,9 @@ class JobsMixin(models.Model):
 
     def get_latest_jobs(self):
         """
-        Return a dictionary mapping of the most recent jobs for this instance.
+        Return a list 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):

+ 1 - 1
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 %}