Fixes #16756: Fix table pagination for custom script results

This commit is contained in:
Jeremy Stretch 2024-08-28 15:05:55 -04:00
parent cac92352ca
commit 50839fcb6b
3 changed files with 8 additions and 9 deletions

View File

@ -1258,6 +1258,9 @@ class ScriptResultView(TableMixin, generic.ObjectView):
# If this is an HTMX request, return only the result HTML
if htmx_partial(request):
if request.GET.get('log'):
# If log=True, render only the log table
return render(request, 'htmx/table.html', context)
response = render(request, 'extras/htmx/script_result.html', context)
if job.completed or not job.started:
response.status_code = 286

View File

@ -41,7 +41,11 @@
<div class="card">
<div class="table-responsive" id="object_list">
<h5 class="card-header">{% trans "Log" %}</h5>
{% include 'htmx/table.html' %}
<div class="htmx-container table-responsive"
hx-get="{% url 'extras:script_result' job_pk=job.pk %}?embedded=True&log=True"
hx-target="this"
hx-trigger="load" hx-select=".htmx-container" hx-swap="outerHTML"
></div>
</div>
</div>
{% endif %}

View File

@ -90,14 +90,6 @@
</div>
{# /Object list tab #}
{# Filters tab #}
{% if filter_form %}
<div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
{% include 'inc/filter_list.html' %}
</div>
{% endif %}
{# /Filters tab #}
{% endblock content %}
{% block modals %}