From f0b4508bf726aa4233afbfb3d654923e8f40d9ce Mon Sep 17 00:00:00 2001 From: Etienne Loupias Date: Thu, 11 Jan 2018 16:28:57 +0100 Subject: [PATCH 2/2] passerelle web service logs per page --- passerelle/base/templatetags/passerelle.py | 3 ++- passerelle/locale/fr/LC_MESSAGES/django.po | 4 ++++ passerelle/templates/passerelle/manage/service_view.html | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/passerelle/base/templatetags/passerelle.py b/passerelle/base/templatetags/passerelle.py index 2e51b37..b04370f 100644 --- a/passerelle/base/templatetags/passerelle.py +++ b/passerelle/base/templatetags/passerelle.py @@ -27,13 +27,14 @@ def access_rights_table(context, resource, permission): def resource_logs_table(context, resource): request = context.get('request') page = request.GET.get('page', 1) + rows = request.GET.get('rows', 10) connector = resource.get_connector_slug() context['connector'] = connector context['slug'] = resource.slug qs = ResourceLog.objects.filter(appname=connector, slug=resource.slug).order_by('-timestamp') - paginator = Paginator(qs, 10) + paginator = Paginator(qs, rows) try: logrecords = paginator.page(page) except PageNotAnInteger: diff --git a/passerelle/locale/fr/LC_MESSAGES/django.po b/passerelle/locale/fr/LC_MESSAGES/django.po index 34cf244..65728c2 100644 --- a/passerelle/locale/fr/LC_MESSAGES/django.po +++ b/passerelle/locale/fr/LC_MESSAGES/django.po @@ -2152,6 +2152,10 @@ msgstr "valeur par défaut :" msgid "Logs" msgstr "Journaux" +#: templates/passerelle/manage/service_view.html:83 +msgid "Per page:" +msgstr "Par page :" + #: templates/passerelle/manage_add.html:7 #: templates/passerelle/manage_add.html:12 msgid "Add a Connector" diff --git a/passerelle/templates/passerelle/manage/service_view.html b/passerelle/templates/passerelle/manage/service_view.html index e00b4e4..7c86f59 100644 --- a/passerelle/templates/passerelle/manage/service_view.html +++ b/passerelle/templates/passerelle/manage/service_view.html @@ -80,6 +80,10 @@
{% block logs %} {% resource_logs_table resource=object %} + {% trans "Per page:" %} + 10, + 50, + 100 {% endblock %}
-- 2.15.1.windows.2