diff options
| author | Étienne Loks <etienne@peacefrogs.net> | 2020-03-23 16:02:01 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne@peacefrogs.net> | 2020-03-23 16:02:01 +0100 |
| commit | 0b952cfd5ac37b2292677bc6575bfbffde6a0129 (patch) | |
| tree | c97767261cfad8604ef4794e8fdd6286c89640dd | |
| parent | 8b85f31e1de3623d1e8cffecd8564b53c7e6b459 (diff) | |
| download | ishtar-pergamon-0b952cfd5ac37b2292677bc6575bfbffde6a0129.tar.bz2 ishtar-pergamon-0b952cfd5ac37b2292677bc6575bfbffde6a0129.zip | |
Fix display of pagniated items
| -rw-r--r-- | showcase/templates/showcase/show_case.html | 6 | ||||
| -rw-r--r-- | showcase/templatetags/__init__.py | 0 | ||||
| -rw-r--r-- | showcase/templatetags/pergamon_showcase.py | 8 | ||||
| -rw-r--r-- | showcase/views.py | 1 |
4 files changed, 13 insertions, 2 deletions
diff --git a/showcase/templates/showcase/show_case.html b/showcase/templates/showcase/show_case.html index 33d6738..acc599a 100644 --- a/showcase/templates/showcase/show_case.html +++ b/showcase/templates/showcase/show_case.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n static wagtailcore_tags wagtailimages_tags %} +{% load i18n static wagtailcore_tags wagtailimages_tags pergamon_showcase %} {% block body_class %}template-showcase{% endblock %} @@ -33,7 +33,9 @@ {% if item.images.0.thumbnail %}<img src="{{item.images.0.thumbnail}}" class="card-img-top">{% endif %} <div class="card-body"> {{item.denomination}} - <a class="stretched-link" href="{% url 'display-item' page.slug forloop.counter0 %}"></a> + {% with forloop.counter|showcase_item_number:paginated_data.number as item_number %} + <a class="stretched-link" href="{% url 'display-item' page.slug item_number %}"></a> + {% endwith %} </div> </div> </div> diff --git a/showcase/templatetags/__init__.py b/showcase/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/showcase/templatetags/__init__.py diff --git a/showcase/templatetags/pergamon_showcase.py b/showcase/templatetags/pergamon_showcase.py new file mode 100644 index 0000000..7053c0f --- /dev/null +++ b/showcase/templatetags/pergamon_showcase.py @@ -0,0 +1,8 @@ +from django.template import Library + +register = Library() + + +@register.filter +def showcase_item_number(loopcounter, page): + return loopcounter + (page - 1) * 10 diff --git a/showcase/views.py b/showcase/views.py index c72cbba..96f0276 100644 --- a/showcase/views.py +++ b/showcase/views.py @@ -26,6 +26,7 @@ def convert_dict(value): def display_item(request, slug, number): q = ShowCase.objects.filter(slug=slug) number = int(number) + number -= 1 # human page number to computer page number if not q.count(): return Http404(_("Unknown source.")) showcase = q.all()[0] |