diff --git a/src/pretix/base/models/organizer.py b/src/pretix/base/models/organizer.py index c77988187c..eb0b09d88a 100644 --- a/src/pretix/base/models/organizer.py +++ b/src/pretix/base/models/organizer.py @@ -4,6 +4,7 @@ from datetime import date, datetime, time from django.core.validators import MinLengthValidator, RegexValidator from django.db import models from django.db.models import Exists, OuterRef, Q +from django.urls import reverse from django.utils.crypto import get_random_string from django.utils.functional import cached_property from django.utils.timezone import get_current_timezone, make_aware, now @@ -88,6 +89,15 @@ class Organizer(LoggedModel): return ObjectRelatedCache(self) + @cached_property + def all_logentries_link(self): + return reverse( + 'control:organizer.log', + kwargs={ + 'organizer': self.slug, + } + ) + @property def has_gift_cards(self): return self.cache.get_or_set( diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py index 3609a7b860..c7f42486d6 100644 --- a/src/pretix/control/logdisplay.py +++ b/src/pretix/control/logdisplay.py @@ -273,8 +273,15 @@ def _display_checkin(event, logentry): def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs): plains = { 'pretix.object.cloned': _('This object has been created by cloning.'), + 'pretix.organizer.changed': _('The organizer has been changed.'), + 'pretix.organizer.settings': _('The organizer settings have been changed.'), + 'pretix.giftcards.acceptance.added': _('Gift card acceptance for another organizer has been added.'), + 'pretix.giftcards.acceptance.removed': _('Gift card acceptance for another organizer has been removed.'), + 'pretix.webhook.created': _('The webhook has been created.'), + 'pretix.webhook.changed': _('The webhook has been changed.'), 'pretix.event.comment': _('The event\'s internal comment has been updated.'), 'pretix.event.canceled': _('The event has been canceled.'), + 'pretix.event.deleted': _('An event has been deleted.'), 'pretix.event.order.modified': _('The order details have been changed.'), 'pretix.event.order.unpaid': _('The order has been marked as unpaid.'), 'pretix.event.order.secret.changed': _('The order\'s secret has been changed.'), diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html index 363e86c5d4..1d33e9dc93 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html @@ -22,54 +22,68 @@ {% csrf_token %} {% bootstrap_form_errors sform %} {% bootstrap_form_errors form %} -