From 1e8f7a7dca77a6017721336ff547444a3b7dc991 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 18 Apr 2016 17:37:23 +0200 Subject: [PATCH] Fixed adding an item picture at creation time --- src/pretix/base/models/items.py | 5 +++-- src/pretix/control/views/item.py | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pretix/base/models/items.py b/src/pretix/base/models/items.py index c449a14feb..6520a18e86 100644 --- a/src/pretix/base/models/items.py +++ b/src/pretix/base/models/items.py @@ -1,4 +1,5 @@ import sys +import uuid from datetime import datetime from decimal import Decimal @@ -66,9 +67,9 @@ class ItemCategory(LoggedModel): def itempicture_upload_to(instance, filename: str) -> str: - return '%s/%s/item-%s.%s' % ( + return '%s/%s/item-%s-%s.%s' % ( instance.event.organizer.slug, instance.event.slug, instance.id, - filename.split('.')[-1] + str(uuid.uuid4()), filename.split('.')[-1] ) diff --git a/src/pretix/control/views/item.py b/src/pretix/control/views/item.py index 518c18bb61..85f732fc3c 100644 --- a/src/pretix/control/views/item.py +++ b/src/pretix/control/views/item.py @@ -582,7 +582,12 @@ class ItemCreate(EventPermissionRequiredMixin, CreateView): def form_valid(self, form): messages.success(self.request, _('Your changes have been saved.')) ret = super().form_valid(form) - form.instance.log_action('pretix.event.item.added', user=self.request.user, data=dict(form.cleaned_data)) + form.instance.log_action('pretix.event.item.added', user=self.request.user, data={ + k: (form.cleaned_data.get(k).name + if isinstance(form.cleaned_data.get(k), File) + else form.cleaned_data.get(k)) + for k in form.changed_data + }) return ret def get_form_kwargs(self):