be able to pass the GET arguments to the email validation template in case some addit...

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

diff --git a/forum/views/auth.py b/forum/views/auth.py
index c9f3111109b5397411a8f603a738d40509018366..d11c20bb417cb62163987aa38d7f0d1bf33088ca 100644 (file)
--- a/forum/views/auth.py
+++ b/forum/views/auth.py
@@ -2,6 +2,7 @@
 
 import datetime
 import logging
+import urllib
 
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
@@ -287,7 +288,12 @@ def send_validation_email(request):
         # We don't care if there are previous cashes in the database... In every case we have to create a new one
         hash = ValidationHash.objects.create_new(request.user, 'email', [request.user.email])
 
-        send_template_email([request.user], "auth/mail_validation.html", {'validation_code': hash})
+        additional_get_params = urllib.urlencode(request.GET)
+        send_template_email([request.user], "auth/mail_validation.html", {
+            'validation_code': hash,
+            'additional_get_params' : additional_get_params
+        })
+
         request.user.message_set.create(message=_("A message with an email validation link was just sent to your address."))
         return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
@@ -400,7 +406,8 @@ def login_and_forward(request, user, forward=None, message=None):
         else:
             return manage_pending_data(request, _('save'), forward)
 
-    return HttpResponseRedirect(forward)
+    additional_get_params = urllib.urlencode(request.GET)
+    return HttpResponseRedirect(forward + "?%s" % additional_get_params)
 
 def forward_suspended_user(request, user, show_private_msg=True):
     message = _("Sorry, but this account is suspended")

diff --git a/forum/views/commands.py b/forum/views/commands.py
index e909bdf2b95036baa98fe00390cf69066f3dd0d6..30e835306dc0b8f126a43f242c949efe129a6b1f 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -22,7 +22,7 @@ from forum import settings
 from decorators import command, CommandException, RefreshPageCommand
 
 class NotEnoughRepPointsException(CommandException):
-    def __init__(self, action, user_reputation=None, reputation_required=None):
+    def __init__(self, action, user_reputation=None, reputation_required=None, node=None):
         if reputation_required is not None and user_reputation is not None:
             message = _(
                 """Sorry, but you don't have enough reputation points to %(action)s.<br />
@@ -87,7 +87,7 @@ def vote_post(request, id, vote_type):
     if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()):
         reputation_required = int(settings.REP_TO_VOTE_UP) if vote_type == 'up' else int(settings.REP_TO_VOTE_DOWN)
         action_type = vote_type == 'up' and _('upvote') or _('downvote')
-        raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required)
+        raise NotEnoughRepPointsException(action_type, user_reputation=user.reputation, reputation_required=reputation_required, node=post)
 
     user_vote_count_today = user.get_vote_count_today()
     user_can_vote_count_today = user.can_vote_count_today()
@@ -178,7 +178,7 @@ def like_comment(request, id):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):
-        raise NotEnoughRepPointsException( _('like comments'))
+        raise NotEnoughRepPointsException( _('like comments'), node=comment)
 
     like = VoteAction.get_action_for(node=comment, user=user)