From 81727df04417b7c33ed4dfcf9603ad758502a9c0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 7 Sep 2018 15:56:02 +0200 Subject: QA action: management of confirm page --- ishtar_common/views.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ishtar_common/views.py') diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 3704106d2..bd4b70d18 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1837,7 +1837,11 @@ class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): data['page_name'] = u"{} – {}".format( self.model._meta.verbose_name, self.model.QA_EDIT.text) data['url'] = self.url - data['confirm'] = self.confirm + if self.confirm: + if 'confirm' not in self.url: + data['url'] = self.url.split('?')[0] + "confirm/" + data['confirm'] = True + data['items'] = self.items return data def form_valid(self, form): @@ -1845,5 +1849,8 @@ class QAItemEditForm(IshtarMixin, LoginRequiredMixin, FormView): self.confirm = True return self.render_to_response( self.get_context_data(form=self.get_form())) - return HttpResponseRedirect(self.get_success_url( - form.cleaned_data['basket'])) + return self.form_save(form) + + def form_save(self, form): + form.save(self.items) + return HttpResponseRedirect(reverse("success")) -- cgit v1.2.3