From a5d2d4d03bd6805009614db55f3651a99f4e8fd0 Mon Sep 17 00:00:00 2001 From: Mira Weller Date: Fri, 27 Jun 2025 17:54:59 +0200 Subject: [PATCH] Use display_name for sync providers --- src/pretix/base/models/datasync.py | 4 +++ src/pretix/control/logdisplay.py | 28 +++++++++++++------ .../pretixcontrol/datasync/failed_jobs.html | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/pretix/base/models/datasync.py b/src/pretix/base/models/datasync.py index 8c8dd537fd..a4100ae087 100644 --- a/src/pretix/base/models/datasync.py +++ b/src/pretix/base/models/datasync.py @@ -72,6 +72,10 @@ class OrderSyncQueue(models.Model): def provider_class(self): return self._provider_class_info[0] + @property + def provider_display_name(self): + return self.provider_class.display_name + @property def is_provider_active(self): return self._provider_class_info[1] diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py index bae8b15897..a9926ccd54 100644 --- a/src/pretix/control/logdisplay.py +++ b/src/pretix/control/logdisplay.py @@ -423,10 +423,21 @@ class OrderPrintLogEntryType(OrderLogEntryType): ) -@log_entry_types.new_from_dict({ - "pretix.event.order.data_sync.success": _("Data successfully transferred to {provider}."), -}) class OrderDataSyncLogEntryType(OrderLogEntryType): + def display(self, logentry, data): + try: + from pretix.base.datasync.datasync import sync_targets + provider_class, meta = sync_targets.get(identifier=data['provider']) + data['provider_display_name'] = provider_class.display_name + except (KeyError, AttributeError): + data['provider_display_name'] = data.get('provider') + return super().display(logentry, data) + + +@log_entry_types.new_from_dict({ + "pretix.event.order.data_sync.success": _("Data successfully transferred to {provider_display_name}."), +}) +class OrderDataSyncSuccessLogEntryType(OrderDataSyncLogEntryType): def display(self, logentry, data): links = [] if data.get('provider') and data.get('objects'): @@ -443,12 +454,13 @@ class OrderDataSyncLogEntryType(OrderLogEntryType): @log_entry_types.new_from_dict({ - "pretix.event.order.data_sync.failed.config": _("Transferring data to {provider} failed due to invalid configuration:"), - "pretix.event.order.data_sync.failed.exceeded": _("Maximum number of retries exceeded while transferring data to {provider}:"), - "pretix.event.order.data_sync.failed.permanent": _("Error while transferring data to {provider}:"), - "pretix.event.order.data_sync.failed.internal": _("Internal error while transferring data to {provider}."), + "pretix.event.order.data_sync.failed.config": _("Transferring data to {provider_display_name} failed due to invalid configuration:"), + "pretix.event.order.data_sync.failed.exceeded": _("Maximum number of retries exceeded while transferring data to {provider_display_name}:"), + "pretix.event.order.data_sync.failed.permanent": _("Error while transferring data to {provider_display_name}:"), + "pretix.event.order.data_sync.failed.internal": _("Internal error while transferring data to {provider_display_name}."), + "pretix.event.order.data_sync.failed.timeout": _("Internal error while transferring data to {provider_display_name}."), }) -class OrderDataSyncErrorLogEntryType(OrderLogEntryType): +class OrderDataSyncErrorLogEntryType(OrderDataSyncLogEntryType): def display(self, logentry, data): errmes = data["error"] if not isinstance(errmes, list): diff --git a/src/pretix/control/templates/pretixcontrol/datasync/failed_jobs.html b/src/pretix/control/templates/pretixcontrol/datasync/failed_jobs.html index 1fca1ad5ca..fe5e5a3ed6 100644 --- a/src/pretix/control/templates/pretixcontrol/datasync/failed_jobs.html +++ b/src/pretix/control/templates/pretixcontrol/datasync/failed_jobs.html @@ -33,7 +33,7 @@ {{ item.order.full_code }} - {{ item.sync_provider }} + {{ item.provider_display_name }} {{ item.triggered }} {% if staff_session %}({{ item.triggered_by }}){% endif %}