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

Fixed problems when adding new questions

Browse Source
This commit is contained in:
Raphael Michel
2016-03-26 13:40:00 +01:00
parent 1cd0c1f53b
commit 0b111ef1fc
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -292,7 +292,7 @@ class QuestionMixin:
if form in self.formset.deleted_forms: if form in self.formset.deleted_forms:
if not form.instance.pk: if not form.instance.pk:
continue continue
self.get_object().log_action( obj.log_action(
'pretix.event.question.option.deleted', user=self.request.user, data={ 'pretix.event.question.option.deleted', user=self.request.user, data={
'id': form.instance.pk 'id': form.instance.pk
} }
@@ -300,11 +300,11 @@ class QuestionMixin:
form.instance.delete() form.instance.delete()
form.instance.pk = None form.instance.pk = None
elif form.has_changed(): elif form.has_changed():
form.instance.question = self.get_object() form.instance.question = obj
form.save() form.save()
change_data = {k: form.cleaned_data.get(k) for k in form.changed_data} change_data = {k: form.cleaned_data.get(k) for k in form.changed_data}
change_data['id'] = form.instance.pk change_data['id'] = form.instance.pk
self.get_object().log_action( obj.log_action(
'pretix.event.question.option.changed', 'pretix.event.question.option.changed',
user=self.request.user, data=change_data user=self.request.user, data=change_data
) )
@@ -314,11 +314,11 @@ class QuestionMixin:
continue continue
if self.formset._should_delete_form(form): if self.formset._should_delete_form(form):
continue continue
form.instance.question = self.get_object() form.instance.question = obj
form.save() form.save()
change_data = {k: form.cleaned_data.get(k) for k in form.changed_data} change_data = {k: form.cleaned_data.get(k) for k in form.changed_data}
change_data['id'] = form.instance.pk change_data['id'] = form.instance.pk
self.get_object().log_action( obj.log_action(
'pretix.event.question.option.added', 'pretix.event.question.option.added',
user=self.request.user, data=change_data user=self.request.user, data=change_data
) )
@@ -393,13 +393,16 @@ class QuestionCreate(EventPermissionRequiredMixin, QuestionMixin, CreateView):
@transaction.atomic() @transaction.atomic()
def form_valid(self, form): def form_valid(self, form):
if form.cleaned_data.get('type') in ('M', 'C'): if form.cleaned_data.get('type') in ('M', 'C'):
if not self.save_formset(self.get_object): if not self.formset.is_valid():
return self.get(self.request, *self.args, **self.kwargs) return self.get(self.request, *self.args, **self.kwargs)
messages.success(self.request, _('The new question has been created.')) messages.success(self.request, _('The new question has been created.'))
ret = super().form_valid(form) ret = super().form_valid(form)
form.instance.log_action('pretix.event.question.added', user=self.request.user, data=dict(form.cleaned_data)) form.instance.log_action('pretix.event.question.added', user=self.request.user, data=dict(form.cleaned_data))
self.save_formset(form.instance)
if form.cleaned_data.get('type') in ('M', 'C'):
self.save_formset(form.instance)
return ret return ret