From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 17 Oct 2011 18:40:45 +0000 (+0000)
Subject: when using non-AJAX context attach the GET parameters to the Redirect URL
X-Git-Tag: live~127
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/2095dca3184ccc6d547fc08d252a18b25550006d

when using non-AJAX context attach the GET parameters to the Redirect URL

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1190 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 4bfcf6b..0e33552 100644
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -3,6 +3,8 @@
 import datetime
 import logging
 
+from urllib import urlencode
+
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.utils import simplejson
@@ -341,7 +343,17 @@ def accept_answer(request, id):
 
         # If the request is not an AJAX redirect to the answer URL rather than to the home page
         if not request.is_ajax():
-            return HttpResponseRedirect(answer.get_absolute_url())
+            msg = _("""
+              Congratulations! You've accepted an answer.
+            """)
+
+            # Notify the user with a message that an answer has been accepted
+            request.user.message_set.create(message=msg)
+
+            # Redirect URL should include additional get parameters that might have been attached
+            redirect_url = answer.parent.get_absolute_url() + "?accepted_answer=true&%s" % smart_unicode(urlencode(request.GET))
+
+            return HttpResponseRedirect(redirect_url)
 
         commands['mark_accepted'] = [answer.id]