From c9b0c3bb7d883f310a68d8f2a4aac0d9a2a4a54d Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Wed, 20 Feb 2019 09:27:23 +0000
Subject: [PATCH] GH-858: Make sure we redirect the user back to same page (inc
q strings)
---
opentech/apply/activity/views.py | 2 +-
opentech/apply/utils/views.py | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opentech/apply/activity/views.py b/opentech/apply/activity/views.py
index f2c69bca1..07ccbd32c 100644
--- a/opentech/apply/activity/views.py
+++ b/opentech/apply/activity/views.py
@@ -73,4 +73,4 @@ class CommentFormView(DelegatedViewMixin, CreateView):
@classmethod
def contribute_form(cls, instance, user):
# We dont want to pass the submission as the instance
- return super().contribute_form(None, user=user)
+ return super().contribute_form(instance=None, user=user)
diff --git a/opentech/apply/utils/views.py b/opentech/apply/utils/views.py
index a8dfda0d3..1cd79277d 100644
--- a/opentech/apply/utils/views.py
+++ b/opentech/apply/utils/views.py
@@ -134,7 +134,10 @@ class DelegatedViewMixin(View):
return cls.context_name, form
def get_success_url(self):
- return self.request.path
+ query = self.request.GET.urlencode()
+ if query:
+ query = '?' + query
+ return self.request.path + query
class CreateOrUpdateView(SingleObjectTemplateResponseMixin, ModelFormMixin, ProcessFormView):
--
GitLab