Compare commits

..

1 Commits

Author SHA1 Message Date
Mira Weller
840cc6edda Fix log entry details for datasync logs without external link (Z#23210015) 2025-10-07 13:41:35 +02:00
3 changed files with 3 additions and 14 deletions

View File

@@ -48,7 +48,7 @@ dependencies = [
"django-libsass==0.9", "django-libsass==0.9",
"django-localflavor==5.0", "django-localflavor==5.0",
"django-markup", "django-markup",
"django-oauth-toolkit==3.1.*", "django-oauth-toolkit==2.3.*",
"django-otp==1.6.*", "django-otp==1.6.*",
"django-phonenumber-field==7.3.*", "django-phonenumber-field==7.3.*",
"django-redis==6.0.*", "django-redis==6.0.*",

View File

@@ -21,8 +21,6 @@
# #
from django import forms from django import forms
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils.functional import lazy
from django.utils.html import format_html
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from pretix.base.modelimport_orders import get_order_import_columns from pretix.base.modelimport_orders import get_order_import_columns
@@ -73,9 +71,6 @@ class ProcessForm(forms.Form):
raise NotImplementedError() # noqa raise NotImplementedError() # noqa
format_html_lazy = lazy(format_html, str)
class OrdersProcessForm(ProcessForm): class OrdersProcessForm(ProcessForm):
orders = forms.ChoiceField( orders = forms.ChoiceField(
label=_('Import mode'), label=_('Import mode'),
@@ -96,11 +91,7 @@ class OrdersProcessForm(ProcessForm):
) )
testmode = forms.BooleanField( testmode = forms.BooleanField(
label=_('Create orders as test mode orders'), label=_('Create orders as test mode orders'),
required=False, required=False
help_text=format_html_lazy(
'<div class="alert alert-warning" data-display-dependency="#id_testmode" data-inverse>{}</div>',
_('Orders not created in test mode cannot be deleted again after import.')
)
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@@ -109,8 +100,6 @@ class OrdersProcessForm(ProcessForm):
initital['testmode'] = self.event.testmode initital['testmode'] = self.event.testmode
kwargs['initial'] = initital kwargs['initial'] = initital
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
if not self.event.testmode:
self.fields["testmode"].help_text = ""
def get_columns(self): def get_columns(self):
return get_order_import_columns(self.event) return get_order_import_columns(self.event)

View File

@@ -455,7 +455,7 @@ class OrderDataSyncSuccessLogEntryType(OrderDataSyncLogEntryType):
links.append(", ".join( links.append(", ".join(
prov.get_external_link_html(logentry.event, obj['external_link_href'], obj['external_link_display_name']) prov.get_external_link_html(logentry.event, obj['external_link_href'], obj['external_link_display_name'])
for obj in objs for obj in objs
if obj and 'external_link_href' in obj and 'external_link_display_name' in obj if obj and obj.get('external_link_href') and obj.get('external_link_display_name')
)) ))
return mark_safe(escape(super().display(logentry, data)) + "".join("<p>" + link + "</p>" for link in links)) return mark_safe(escape(super().display(logentry, data)) + "".join("<p>" + link + "</p>" for link in links))