rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-24 07:53:47 +00:00
Code Issues Releases Wiki Activity

Add pagination for machine history results

Browse source
This commit is contained in:
Jean-Romain Garnier 2020-04-22 19:10:10 +02:00 committed by klafyvel
parent 91cee11297
commit 01236373aa
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
logs/templates/logs/machine_history.html
View file

@ -66,6 +66,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% include 'pagination.html' with list=events %}
{% else %} {% else %}
<h3>{% trans "No result" %}</h3> <h3>{% trans "No result" %}</h3>
{% endif %} {% endif %}

17
logs/views.py
View file

@ -489,16 +489,19 @@ def stats_search_machine_history(request):
history_form = MachineHistoryForm(request.GET or None) history_form = MachineHistoryForm(request.GET or None)
if history_form.is_valid(): if history_form.is_valid():
history = MachineHistory() history = MachineHistory()
return render( events = history.get(
request,
"logs/machine_history.html",
{
"events":
history.get(
history_form.cleaned_data.get("q", ""), history_form.cleaned_data.get("q", ""),
history_form.cleaned_data history_form.cleaned_data
) )
}, max_result = GeneralOption.get_cached_value("search_display_page")
re2o_paginator(request,
events,
max_result)
return render(
request,
"logs/machine_history.html",
{ "events": events },
) )
return render(request, "logs/search_machine_history.html", {"history_form": history_form}) return render(request, "logs/search_machine_history.html", {"history_form": history_form})