the variable needs to be defined with var in front of it, because otherwise it is...

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

diff --git a/forum/views/commands.py b/forum/views/commands.py
index e909bdf2b95036baa98fe00390cf69066f3dd0d6..83a6211a8448a001555e5bbb7d157d3464d42cbf 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):
 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 />


@@ -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')
     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()


@@ -178,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)
 


@@ -218,17 +218,17 @@ def delete_comment(request, id):
 
 @decorate.withfn(command)
 def mark_favorite(request, id):
 
 @decorate.withfn(command)
 def mark_favorite(request, id):

-    question = get_object_or_404(Question, id=id)
+    node = get_object_or_404(Node, id=id)

 
     if not request.user.is_authenticated():
         raise AnonymousNotAllowedException(_('mark a question as favorite'))
 
     try:
 
     if not request.user.is_authenticated():
         raise AnonymousNotAllowedException(_('mark a question as favorite'))
 
     try:

-        favorite = FavoriteAction.objects.get(canceled=False, node=question, user=request.user)
+        favorite = FavoriteAction.objects.get(canceled=False, node=node, user=request.user)

         favorite.cancel(ip=request.META['REMOTE_ADDR'])
         added = False
     except ObjectDoesNotExist:
         favorite.cancel(ip=request.META['REMOTE_ADDR'])
         added = False
     except ObjectDoesNotExist:

-        FavoriteAction(node=question, user=request.user, ip=request.META['REMOTE_ADDR']).save()
+        FavoriteAction(node=node, user=request.user, ip=request.META['REMOTE_ADDR']).save()

         added = True
 
     return {
         added = True
 
     return {


@@ -613,7 +613,11 @@ def award_points(request, user_id, answer_id):
         raise AnonymousNotAllowedException(_('award'))
 
     if not request.POST:
         raise AnonymousNotAllowedException(_('award'))
 
     if not request.POST:

-        return render_to_response("node/award_points.html", { 'user' : user, 'awarded_user' : awarded_user, })
+        return render_to_response("node/award_points.html", {
+            'user' : user,
+            'awarded_user' : awarded_user,
+            'reputation_to_comment' : str(settings.REP_TO_COMMENT)
+        })

     else:
         points = int(request.POST['points'])
 
     else:
         points = int(request.POST['points'])