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

Improve log display

Browse Source
This commit is contained in:
Raphael Michel
2017-01-03 23:58:51 +01:00
parent 2ee0ff755d
commit aa2f0e0fd0
5 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
from decimal import Decimal
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse
from django.db.models import Sum
from django.dispatch import receiver
@@ -9,11 +10,13 @@ from django.utils import formats
from django.utils.formats import date_format
from django.utils.translation import ugettext_lazy as _
from pretix.base.models import Event, Item, Order, OrderPosition
from pretix.base.models import Event, Item, Order, OrderPosition, Voucher
from pretix.control.signals import (
event_dashboard_widgets, user_dashboard_widgets,
)
from ..logdisplay import OVERVIEW_BLACKLIST
NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'
@@ -154,9 +157,19 @@ def event_index(request, organizer, event):
widgets = []
for r, result in event_dashboard_widgets.send(sender=request.event):
widgets.extend(result)
qs = request.event.logentry_set.all().select_related('user', 'content_type').order_by('-datetime')
qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
if not request.eventperm.can_view_orders:
qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
if not request.eventperm.can_view_vouchers:
qs = qs.exclude(content_type=ContentType.objects.get_for_model(Voucher))
ctx = {
'widgets': rearrange(widgets),
'logs': qs[:5]
}
return render(request, 'pretixcontrol/event/index.html', ctx)

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

@@ -34,6 +34,7 @@ from pretix.control.permissions import EventPermissionRequiredMixin
from pretix.presale.style import regenerate_css
from . import UpdateView
from ..logdisplay import OVERVIEW_BLACKLIST
class EventUpdate(EventPermissionRequiredMixin, UpdateView):
@@ -654,7 +655,8 @@ class EventLog(EventPermissionRequiredMixin, ListView):
paginate_by = 20
def get_queryset(self):
qs = self.request.event.logentry_set.all().select_related('user', 'content_type')
qs = self.request.event.logentry_set.all().select_related('user', 'content_type').order_by('-datetime')
qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
if not self.request.eventperm.can_view_orders:
qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
if not self.request.eventperm.can_view_vouchers: