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

Fix circular imports

Browse Source
This commit is contained in:
Mira Weller
2024-09-23 18:45:20 +02:00
parent 47b84c06b0
commit fe67b70766
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pretix/base/logentrytypes.py
View File

@@ -4,11 +4,34 @@ from django.urls import reverse
from django.utils.html import escape from django.utils.html import escape
from django.utils.translation import gettext_lazy as _, pgettext_lazy from django.utils.translation import gettext_lazy as _, pgettext_lazy
from pretix.base.models.log import make_link from pretix.base.signals import PluginRegistry
from pretix.base.signals import EventPluginRegistry
class LogEntryTypeRegistry(EventPluginRegistry): def make_link(a_map, wrapper, is_active=True, event=None, plugin_name=None):
if a_map:
if is_active:
a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
elif event and plugin_name:
a_map['val'] = (
'<i>{val}</i> <a href="{plugin_href}">'
'<span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span></a>'
).format_map({
**a_map,
"errmes": _("The relevant plugin is currently not active. To activate it, click here to go to the plugin settings."),
"plugin_href": reverse('control:event.settings.plugins', kwargs={
'organizer': event.organizer.slug,
'event': event.slug,
}) + '#plugin_' + plugin_name,
})
else:
a_map['val'] = '<i>{val}</i> <span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span>'.format_map({
**a_map,
"errmes": _("The relevant plugin is currently not active."),
})
return wrapper.format_map(a_map)
class LogEntryTypeRegistry(PluginRegistry):
def new_from_dict(self, data): def new_from_dict(self, data):
def reg(clz): def reg(clz):
for action_type, plain in data.items(): for action_type, plain in data.items():

26
src/pretix/base/models/log.py
View File

@@ -42,7 +42,7 @@ from django.urls import reverse
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from pretix.base.logentrytypes import log_entry_types from pretix.base.logentrytypes import log_entry_types, make_link
from pretix.base.signals import is_app_active, logentry_object_link from pretix.base.signals import is_app_active, logentry_object_link
@@ -51,30 +51,6 @@ class VisibleOnlyManager(models.Manager):
return super().get_queryset().filter(visible=True) return super().get_queryset().filter(visible=True)
def make_link(a_map, wrapper, is_active=True, event=None, plugin_name=None):
if a_map:
if is_active:
a_map['val'] = '<a href="{href}">{val}</a>'.format_map(a_map)
elif event and plugin_name:
a_map['val'] = (
'<i>{val}</i> <a href="{plugin_href}">'
'<span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span></a>'
).format_map({
**a_map,
"errmes": _("The relevant plugin is currently not active. To activate it, click here to go to the plugin settings."),
"plugin_href": reverse('control:event.settings.plugins', kwargs={
'organizer': event.organizer.slug,
'event': event.slug,
}) + '#plugin_' + plugin_name,
})
else:
a_map['val'] = '<i>{val}</i> <span data-toggle="tooltip" title="{errmes}" class="fa fa-warning fa-fw"></span>'.format_map({
**a_map,
"errmes": _("The relevant plugin is currently not active."),
})
return wrapper.format_map(a_map)
class LogEntry(models.Model): class LogEntry(models.Model):
""" """
Represents a change or action that has been performed on another object Represents a change or action that has been performed on another object