CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Replace occurrences of "blacklist" with "banlist" (#1434)

Browse Source 
* Rename blacklist to banlist

* Rename more cases of blacklist to banlist

* Rename Blacklist -> Banlist in migrations
This commit is contained in:
Sohalt
2019-10-15 14:58:48 +02:00
committed by Raphael Michel
parent a4d8c810ce
commit b870dde301
24 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ from pretix.control.signals import (
)
from pretix.helpers.daterange import daterange
from ..logdisplay import OVERVIEW_BLACKLIST
from ..logdisplay import OVERVIEW_BANLIST
NUM_WIDGET = '<div class="numwidget"><span class="num">{num}</span><span class="text">{text}</span></div>'
@@ -286,7 +286,7 @@ def event_index(request, organizer, event):
request=request)
qs = request.event.logentry_set.all().select_related('user', 'content_type', 'api_token', 'oauth_application',
'device').order_by('-datetime')
qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
qs = qs.exclude(action_type__in=OVERVIEW_BANLIST)
if not request.user.has_event_permission(request.organizer, request.event, 'can_view_orders', request=request):
qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))
if not request.user.has_event_permission(request.organizer, request.event, 'can_view_vouchers', request=request):

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

@@ -49,7 +49,7 @@ from pretix.multidomain.urlreverse import get_domain
from pretix.plugins.stripe.payment import StripeSettingsHolder
from pretix.presale.style import regenerate_css
from ..logdisplay import OVERVIEW_BLACKLIST
from ..logdisplay import OVERVIEW_BANLIST
from . import CreateView, PaginationMixin, UpdateView
@@ -868,7 +868,7 @@ class EventLog(EventPermissionRequiredMixin, ListView):
qs = self.request.event.logentry_set.all().select_related(
'user', 'content_type', 'api_token', 'oauth_application', 'device'
).order_by('-datetime')
qs = qs.exclude(action_type__in=OVERVIEW_BLACKLIST)
qs = qs.exclude(action_type__in=OVERVIEW_BANLIST)
if not self.request.user.has_event_permission(self.request.organizer, self.request.event, 'can_view_orders',
request=self.request):
qs = qs.exclude(content_type=ContentType.objects.get_for_model(Order))