NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 17:26:10 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix display of associated jobs

Browse Source
This commit is contained in:
jeremystretch 2023-03-29 09:55:35 -04:00
parent 48ee8a94b4
commit c915d2360c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/extras/views.py
View File

@ -819,11 +819,10 @@ class ReportListView(ContentTypePermissionRequiredMixin, View):
def get(self, request): def get(self, request):
report_modules = ReportModule.objects.restrict(request.user) report_modules = ReportModule.objects.restrict(request.user)
report_content_type = ContentType.objects.get(app_label='extras', model='report')
jobs = { jobs = {
r.name: r r.name: r
for r in Job.objects.filter( for r in Job.objects.filter(
object_type=report_content_type, object_type=ContentType.objects.get_by_natural_key('extras', 'reportmodule'),
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).order_by('name', '-created').distinct('name').defer('data') ).order_by('name', '-created').distinct('name').defer('data')
} }
@ -987,11 +986,10 @@ class ScriptListView(ContentTypePermissionRequiredMixin, View):
def get(self, request): def get(self, request):
script_modules = ScriptModule.objects.restrict(request.user) script_modules = ScriptModule.objects.restrict(request.user)
script_content_type = ContentType.objects.get(app_label='extras', model='script')
jobs = { jobs = {
r.name: r r.name: r
for r in Job.objects.filter( for r in Job.objects.filter(
object_type=script_content_type, object_type=ContentType.objects.get_by_natural_key('extras', 'scriptmodule'),
status__in=JobStatusChoices.TERMINAL_STATE_CHOICES status__in=JobStatusChoices.TERMINAL_STATE_CHOICES
).order_by('name', '-created').distinct('name').defer('data') ).order_by('name', '-created').distinct('name').defer('data')
} }

2
netbox/templates/extras/report_list.html
View File

@ -50,7 +50,7 @@
</thead> </thead>
<tbody> <tbody>
{% for report_name, report in module.reports.items %} {% for report_name, report in module.reports.items %}
{% with last_result=jobs|get_key:report.full_name %} {% with last_result=jobs|get_key:report.name %}
<tr> <tr>
<td> <td>
<a href="{% url 'extras:report' module=module.path name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">{{ report.name }}</a> <a href="{% url 'extras:report' module=module.path name=report.class_name %}" id="{{ report.module }}.{{ report.class_name }}">{{ report.name }}</a>

2
netbox/templates/extras/script_list.html
View File

@ -48,7 +48,7 @@
</thead> </thead>
<tbody> <tbody>
{% for script_name, script_class in module.scripts.items %} {% for script_name, script_class in module.scripts.items %}
{% with last_result=jobs|get_key:script_class.full_name %} {% with last_result=jobs|get_key:script_class.name %}
<tr> <tr>
<td> <td>
<a href="{% url 'extras:script' module=module.path name=script_name %}" name="script.{{ script_name }}">{{ script_class.name }}</a> <a href="{% url 'extras:script' module=module.path name=script_name %}" name="script.{{ script_name }}">{{ script_class.name }}</a>