From feba94547a127abb9b6d53fe8f4b4fe5c104985d Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 4 Dec 2017 16:24:07 +0100 Subject: [PATCH] Dashboard and product list: Respect availability dates of products --- .../control/templates/pretixcontrol/items/index.html | 7 +++++++ src/pretix/control/views/dashboards.py | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/src/pretix/control/templates/pretixcontrol/items/index.html b/src/pretix/control/templates/pretixcontrol/items/index.html index 296270a5d..c982f4d8f 100644 --- a/src/pretix/control/templates/pretixcontrol/items/index.html +++ b/src/pretix/control/templates/pretixcontrol/items/index.html @@ -34,6 +34,7 @@ + {% trans "Category" %} @@ -51,6 +52,12 @@ {% if not i.active %}{% endif %} + + {% if i.available_from or i.available_until %} + + + {% endif %} + {% if i.admission %} diff --git a/src/pretix/control/views/dashboards.py b/src/pretix/control/views/dashboards.py index 675d2f3b0..d96a422d5 100644 --- a/src/pretix/control/views/dashboards.py +++ b/src/pretix/control/views/dashboards.py @@ -13,6 +13,7 @@ from django.template.loader import get_template from django.utils import formats from django.utils.formats import date_format from django.utils.html import escape +from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _, ungettext from pretix.base.models import ( @@ -34,6 +35,9 @@ NUM_WIDGET = '
{num}