CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-07 15:34:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Item creation: Fix saving meta data (#3534)

Browse Source
This commit is contained in:
Raphael Michel
2023-08-21 16:21:17 +02:00
committed by GitHub
parent 691159ed83
commit d5951415a4
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1188,7 +1188,7 @@ class MetaDataEditorMixin:
@cached_property @cached_property
def meta_forms(self): def meta_forms(self):
if hasattr(self, 'object') and self.object: if getattr(self, 'object', None):
val_instances = { val_instances = {
v.property_id: v for v in self.object.meta_values.all() v.property_id: v for v in self.object.meta_values.all()
} }
@@ -1205,13 +1205,18 @@ class MetaDataEditorMixin:
return self.meta_form( return self.meta_form(
prefix='prop-{}'.format(p.pk), prefix='prop-{}'.format(p.pk),
property=p, property=p,
instance=val_instances.get(p.pk, self.meta_model(property=p, item=self.object)), instance=val_instances.get(
p.pk,
self.meta_model(property=p, item=self.object if getattr(self, 'object', None) else None)
),
data=(self.request.POST if self.request.method == "POST" else None) data=(self.request.POST if self.request.method == "POST" else None)
) )
def save_meta(self): def save_meta(self):
for f in self.meta_forms: for f in self.meta_forms:
if f.cleaned_data.get('value'): if f.cleaned_data.get('value'):
if not f.instance.item_id:
f.instance.item = self.object
f.save() f.save()
elif f.instance and f.instance.pk: elif f.instance and f.instance.pk:
f.instance.delete() f.instance.delete()
@@ -1257,6 +1262,7 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
messages.success(self.request, _('Your changes have been saved.')) messages.success(self.request, _('Your changes have been saved.'))
ret = super().form_valid(form) ret = super().form_valid(form)
self.save_meta()
form.instance.log_action('pretix.event.item.added', user=self.request.user, data={ form.instance.log_action('pretix.event.item.added', user=self.request.user, data={
k: (form.cleaned_data.get(k).name k: (form.cleaned_data.get(k).name
if isinstance(form.cleaned_data.get(k), File) if isinstance(form.cleaned_data.get(k), File)
@@ -1283,6 +1289,13 @@ class ItemCreate(EventPermissionRequiredMixin, MetaDataEditorMixin, CreateView):
ctx['meta_forms'] = self.meta_forms ctx['meta_forms'] = self.meta_forms
return ctx return ctx
def post(self, request, *args, **kwargs):
form = self.get_form()
if form.is_valid() and all([f.is_valid() for f in self.meta_forms]):
return self.form_valid(form)
else:
return self.form_invalid(form)
class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView): class ItemUpdateGeneral(ItemDetailMixin, EventPermissionRequiredMixin, MetaDataEditorMixin, UpdateView):
form_class = ItemUpdateForm form_class = ItemUpdateForm