GH-858: Make sure we redirect the user back to same page (inc q strings)

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)

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):