Fixed adding an item picture at creation time

This commit is contained in:
Raphael Michel
2016-04-18 17:37:23 +02:00
parent f85cc64463
commit 1e8f7a7dca
2 changed files with 9 additions and 3 deletions

View File

@@ -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]
)

View File

@@ -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):