CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix an AttributeError introduced in 104f84b7

Browse Source
This commit is contained in:
Raphael Michel
2019-02-26 14:18:42 +01:00
parent 8b3ce69425
commit 0e89d4c0f7
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pretix/control/forms/item.py
View File

@@ -160,6 +160,7 @@ class ItemCreateForm(I18nModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.event = kwargs['event'] self.event = kwargs['event']
self.user = kwargs.pop('user')
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['category'].queryset = self.instance.event.categories.all() self.fields['category'].queryset = self.instance.event.categories.all()
@@ -239,7 +240,7 @@ class ItemCreateForm(I18nModelForm):
if self.cleaned_data.get('quota_option') == self.EXISTING and self.cleaned_data.get('quota_add_existing') is not None: if self.cleaned_data.get('quota_option') == self.EXISTING and self.cleaned_data.get('quota_add_existing') is not None:
quota = self.cleaned_data.get('quota_add_existing') quota = self.cleaned_data.get('quota_add_existing')
quota.items.add(self.instance) quota.items.add(self.instance)
quota.log_action('pretix.event.quota.changed', user=self.request.user, data={ quota.log_action('pretix.event.quota.changed', user=self.user, data={
'item_added': self.instance.pk 'item_added': self.instance.pk
}) })
elif self.cleaned_data.get('quota_option') == self.NEW: elif self.cleaned_data.get('quota_option') == self.NEW:
@@ -250,7 +251,7 @@ class ItemCreateForm(I18nModelForm):
event=self.event, name=quota_name, size=quota_size event=self.event, name=quota_name, size=quota_size
) )
quota.items.add(self.instance) quota.items.add(self.instance)
quota.log_action('pretix.event.quota.added', user=self.request.user, data={ quota.log_action('pretix.event.quota.added', user=self.user, data={
'name': quota_name, 'name': quota_name,
'size': quota_size, 'size': quota_size,
'items': [self.instance.pk] 'items': [self.instance.pk]

2
src/pretix/control/views/item.py
View File

@@ -817,7 +817,7 @@ class ItemCreate(EventPermissionRequiredMixin, CreateView):
""" """
newinst = Item(event=self.request.event) newinst = Item(event=self.request.event)
kwargs = super().get_form_kwargs() kwargs = super().get_form_kwargs()
kwargs.update({'instance': newinst}) kwargs.update({'instance': newinst, 'user': self.request.user})
return kwargs return kwargs
def form_invalid(self, form): def form_invalid(self, form):