diff --git a/src/pretix/control/views/orders.py b/src/pretix/control/views/orders.py index 38389730e..ab1ed655d 100644 --- a/src/pretix/control/views/orders.py +++ b/src/pretix/control/views/orders.py @@ -7,6 +7,7 @@ import pytz import vat_moss.id from django.conf import settings from django.contrib import messages +from django.core.files import File from django.core.urlresolvers import reverse from django.db.models import Count from django.http import FileResponse, Http404, HttpResponseNotAllowed @@ -698,7 +699,12 @@ class OrderModifyInformation(OrderQuestionsViewMixin, OrderView): self.invoice_form.save() self.order.log_action('pretix.event.order.modified', { 'invoice_data': self.invoice_form.cleaned_data, - 'data': [f.cleaned_data for f in self.forms] + 'data': [{ + k: (f.cleaned_data.get(k).name + if isinstance(f.cleaned_data.get(k), File) + else f.cleaned_data.get(k)) + for k in f.changed_data + } for f in self.forms] }, user=request.user) if self.invoice_form.has_changed(): success_message = ('The invoice address has been updated. If you want to generate a new invoice, ' diff --git a/src/pretix/presale/views/order.py b/src/pretix/presale/views/order.py index 7120193a1..cd9ecc3f7 100644 --- a/src/pretix/presale/views/order.py +++ b/src/pretix/presale/views/order.py @@ -3,6 +3,7 @@ import os from decimal import Decimal from django.contrib import messages +from django.core.files import File from django.db import transaction from django.db.models import Sum from django.http import FileResponse, Http404, JsonResponse @@ -450,7 +451,12 @@ class OrderModify(EventViewMixin, OrderDetailMixin, OrderQuestionsViewMixin, Tem self.invoice_form.save() self.order.log_action('pretix.event.order.modified', { 'invoice_data': self.invoice_form.cleaned_data, - 'data': [f.cleaned_data for f in self.forms] + 'data': [{ + k: (f.cleaned_data.get(k).name + if isinstance(f.cleaned_data.get(k), File) + else f.cleaned_data.get(k)) + for k in f.changed_data + } for f in self.forms] }) if self.invoice_form.has_changed(): success_message = ('Your invoice address has been updated. Please contact us if you need us '