CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-08 15:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dashboard and product list: Respect availability dates of products

Browse Source
This commit is contained in:
Raphael Michel
2017-12-04 16:24:07 +01:00
parent 1b82b64a0a
commit feba94547a
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/control/templates/pretixcontrol/items/index.html
View File

@@ -34,6 +34,7 @@
<th class="iconcol"></th> <th class="iconcol"></th>
<th class="iconcol"></th> <th class="iconcol"></th>
<th class="iconcol"></th> <th class="iconcol"></th>
<th class="iconcol"></th>
<th>{% trans "Category" %}</th> <th>{% trans "Category" %}</th>
<th class="action-col-2"></th> <th class="action-col-2"></th>
<th class="action-col-2"></th> <th class="action-col-2"></th>
@@ -51,6 +52,12 @@
{% if not i.active %}</strike>{% endif %} {% if not i.active %}</strike>{% endif %}
</strong> </strong>
</td> </td>
<td>
{% if i.available_from or i.available_until %}
<span class="fa fa-clock-o fa-fw text-muted" data-toggle="tooltip" title="{% trans "Only available in a limited timeframe" %}">
</span>
{% endif %}
</td>
<td> <td>
{% if i.admission %} {% if i.admission %}
<span class="fa fa-user fa-fw text-muted" data-toggle="tooltip" title="{% trans "Admission ticket" %}"></span> <span class="fa fa-user fa-fw text-muted" data-toggle="tooltip" title="{% trans "Admission ticket" %}"></span>

4
src/pretix/control/views/dashboards.py
View File

@@ -13,6 +13,7 @@ from django.template.loader import get_template
from django.utils import formats from django.utils import formats
from django.utils.formats import date_format from django.utils.formats import date_format
from django.utils.html import escape from django.utils.html import escape
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _, ungettext from django.utils.translation import ugettext_lazy as _, ungettext
from pretix.base.models import ( from pretix.base.models import (
@@ -34,6 +35,9 @@ NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="
def base_widgets(sender, subevent=None, **kwargs): def base_widgets(sender, subevent=None, **kwargs):
prodc = Item.objects.filter( prodc = Item.objects.filter(
event=sender, active=True, event=sender, active=True,
).filter(
(Q(available_until__isnull=True) | Q(available_until__gte=now())) &
(Q(available_from__isnull=True) | Q(available_from__lte=now()))
).count() ).count()
if subevent: if subevent: