no need to force unicode here, and its causing errors in some feeds

[osqa.git] / forum / views / commands.py

diff --git a/forum/views/commands.py b/forum/views/commands.py
index 7abdbef7f5633521fda8b50ed60bc9580c92e856..30e835306dc0b8f126a43f242c949efe129a6b1f 100644 (file)
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -3,12 +3,14 @@
 import datetime
 import logging
 
 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
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ungettext, ugettext as _
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.utils import simplejson
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ungettext, ugettext as _

-from django.http import HttpResponse, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404

 from django.shortcuts import get_object_or_404, render_to_response
 
 from forum.models import *
 from django.shortcuts import get_object_or_404, render_to_response
 
 from forum.models import *


@@ -20,7 +22,7 @@ from forum import settings
 from decorators import command, CommandException, RefreshPageCommand
 
 class NotEnoughRepPointsException(CommandException):
 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 />
         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 />


@@ -85,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')
     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()
 
     user_vote_count_today = user.get_vote_count_today()
     user_can_vote_count_today = user.can_vote_count_today()


@@ -176,7 +178,7 @@ def like_comment(request, id):
         raise CannotDoOnOwnException(_('like'))
 
     if not user.can_like_comment(comment):
         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)
 
 
     like = VoteAction.get_action_for(node=comment, user=user)
 


@@ -282,6 +284,7 @@ def comment(request, id):
                 reverse('node_markdown', kwargs={'id': comment.id}),
                 reverse('convert_comment', kwargs={'id': comment.id}),
                 user.can_convert_comment_to_answer(comment),
                 reverse('node_markdown', kwargs={'id': comment.id}),
                 reverse('convert_comment', kwargs={'id': comment.id}),
                 user.can_convert_comment_to_answer(comment),

+                bool(settings.SHOW_LATEST_COMMENTS_FIRST)

                 ]
         }
         }
                 ]
         }
         }


@@ -338,6 +341,21 @@ def accept_answer(request, id):
 
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()
 
 
         AcceptAnswerAction(node=answer, user=user, ip=request.META['REMOTE_ADDR']).save()

+
+        # If the request is not an AJAX redirect to the answer URL rather than to the home page
+        if not request.is_ajax():
+            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]
 
     return {'commands': commands}
         commands['mark_accepted'] = [answer.id]
 
     return {'commands': commands}