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

Fix errors around subevent editing

Browse Source
This commit is contained in:
Raphael Michel
2020-09-01 15:05:36 +02:00
parent 5e212c83e4
commit f633cc3103
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pretix/control/views/subevents.py
View File

@@ -387,6 +387,7 @@ class SubEventUpdate(EventPermissionRequiredMixin, SubEventEditorMixin, UpdateVi
if self.is_valid(form): if self.is_valid(form):
r = self.form_valid(form) r = self.form_valid(form)
return r return r
messages.error(self.request, _('We could not save your changes. See below for details.'))
return self.form_invalid(form) return self.form_invalid(form)
def get_object(self, queryset=None) -> SubEvent: def get_object(self, queryset=None) -> SubEvent:
@@ -800,7 +801,7 @@ class SubEventBulkCreate(SubEventEditorMixin, EventPermissionRequiredMixin, Crea
to_save_items = [] to_save_items = []
to_save_variations = [] to_save_variations = []
for f in self.formset.forms: for f in self.formset.forms:
if self.formset._should_delete_form(f): if self.formset._should_delete_form(f) or not f.has_changed():
continue continue
change_data = {k: f.cleaned_data.get(k) for k in f.changed_data} change_data = {k: f.cleaned_data.get(k) for k in f.changed_data}
@@ -834,7 +835,7 @@ class SubEventBulkCreate(SubEventEditorMixin, EventPermissionRequiredMixin, Crea
to_save_products = [] to_save_products = []
for f in self.cl_formset.forms: for f in self.cl_formset.forms:
if self.cl_formset._should_delete_form(f): if self.cl_formset._should_delete_form(f) or not f.has_changed():
continue continue
change_data = {k: f.cleaned_data.get(k) for k in f.changed_data} change_data = {k: f.cleaned_data.get(k) for k in f.changed_data}
for se in subevents: for se in subevents:
@@ -862,7 +863,6 @@ class SubEventBulkCreate(SubEventEditorMixin, EventPermissionRequiredMixin, Crea
self.request.event.cache.clear() self.request.event.cache.clear()
messages.success(self.request, pgettext_lazy('subevent', '{} new dates have been created.').format(len(subevents))) messages.success(self.request, pgettext_lazy('subevent', '{} new dates have been created.').format(len(subevents)))
return self.get(self.request, *self.args, **self.kwargs)
return redirect(reverse('control:event.subevents', kwargs={ return redirect(reverse('control:event.subevents', kwargs={
'organizer': self.request.event.organizer.slug, 'organizer': self.request.event.organizer.slug,
'event': self.request.event.slug, 'event': self.request.event.slug,
@@ -875,4 +875,5 @@ class SubEventBulkCreate(SubEventEditorMixin, EventPermissionRequiredMixin, Crea
if self.is_valid(form): if self.is_valid(form):
return self.form_valid(form) return self.form_valid(form)
messages.error(self.request, _('We could not save your changes. See below for details.'))
return self.form_invalid(form) return self.form_invalid(form)