From 8f7791f6908409df7db990029626c3d719dec4ef Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Thu, 15 Jun 2017 02:08:48 +0200
Subject: [PATCH] working

---
 examples/wagtaildemo                                |  2 +-
 .../contrib/apps/wagtail_integration/abstract.py    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/wagtaildemo b/examples/wagtaildemo
index 2edb979d..7ee38cf3 160000
--- a/examples/wagtaildemo
+++ b/examples/wagtaildemo
@@ -1 +1 @@
-Subproject commit 2edb979d27557ea63183f5c061c957dcbaa97451
+Subproject commit 7ee38cf379abca98627203ae7dce094535a60bff
diff --git a/src/fobi/contrib/apps/wagtail_integration/abstract.py b/src/fobi/contrib/apps/wagtail_integration/abstract.py
index 134a8713..91101079 100644
--- a/src/fobi/contrib/apps/wagtail_integration/abstract.py
+++ b/src/fobi/contrib/apps/wagtail_integration/abstract.py
@@ -3,6 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import os
 
 from django.db import models
+from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _
 
 from fobi.integration.processors import IntegrationProcessor
@@ -173,9 +174,9 @@ class AbstractFobiFormPage(Page):
             name, ext = os.path.splitext(self.template)
             self.form_template = name + '_form' + ext
 
-            if not hasattr(self, 'form_template'):
-                name, ext = os.path.splitext(self.template)
-                self.form_template = name + '_form_success' + ext
+        if not hasattr(self, 'success_template'):
+            name, ext = os.path.splitext(self.template)
+            self.success_template = name + '_form_success' + ext
 
     def get_form_template(self, request):
         """Get an alternative template name.
@@ -207,13 +208,15 @@ class AbstractFobiFormPage(Page):
         if response:
             return response
 
-        return fobi_form_processor.rendered_output
+        return HttpResponse(fobi_form_processor.rendered_output)
 
     def serve_preview(self, request, mode):
         """Serve the page in Wagtail's 'preview' mode."""
         if mode == 'success':
             fobi_form_processor = FobiFormProcessor()
-            return fobi_form_processor.show_thanks_page(request, self)
+            return HttpResponse(
+                fobi_form_processor.show_thanks_page(request, self)
+            )
         else:
             return super(AbstractFobiFormPage, self).serve_preview(request,
                                                                    mode)