X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/8058fe3f8e019699a3032c1e8e7d02015c7e2612..c8537fcc3215267c5ffc9a80137a02ceffc7e895:/forum/views/commands.py
diff --git a/forum/views/commands.py b/forum/views/commands.py
index f7d91ae..e909bdf 100644
--- a/forum/views/commands.py
+++ b/forum/views/commands.py
@@ -1,28 +1,44 @@
+# -*- coding: utf-8 -*-
+
import datetime
-from forum import settings
+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.http import HttpResponse, HttpResponseRedirect, Http404
from django.shortcuts import get_object_or_404, render_to_response
-from django.utils.translation import ungettext, ugettext as _
-from django.template import RequestContext
+
from forum.models import *
-from forum.models.node import NodeMetaClass
+from forum.utils.decorators import ajax_login_required
from forum.actions import *
-from django.core.urlresolvers import reverse
-from forum.utils.decorators import ajax_method, ajax_login_required
-from decorators import command, CommandException, RefreshPageCommand
from forum.modules import decorate
from forum import settings
-import logging
+
+from decorators import command, CommandException, RefreshPageCommand
class NotEnoughRepPointsException(CommandException):
- def __init__(self, action):
- super(NotEnoughRepPointsException, self).__init__(
- _(
- """Sorry, but you don't have enough reputation points to %(action)s.
Please check the faq"""
- ) % {'action': action, 'faq_url': reverse('faq')}
- )
+ def __init__(self, action, user_reputation=None, reputation_required=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.
+ The minimum reputation required is %(reputation_required)d (yours is %(user_reputation)d).
+ Please check the FAQ"""
+ ) % {
+ 'action': action,
+ 'faq_url': reverse('faq'),
+ 'reputation_required' : reputation_required,
+ 'user_reputation' : user_reputation,
+ }
+ else:
+ message = _(
+ """Sorry, but you don't have enough reputation points to %(action)s.
Please check the faq"""
+ ) % {'action': action, 'faq_url': reverse('faq')}
+ super(NotEnoughRepPointsException, self).__init__(message)
class CannotDoOnOwnException(CommandException):
def __init__(self, action):
@@ -69,9 +85,12 @@ def vote_post(request, id, vote_type):
raise CannotDoOnOwnException(_('vote'))
if not (vote_type == 'up' and user.can_vote_up() or user.can_vote_down()):
- raise NotEnoughRepPointsException(vote_type == 'up' and _('upvote') or _('downvote'))
+ 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)
user_vote_count_today = user.get_vote_count_today()
+ user_can_vote_count_today = user.can_vote_count_today()
if user_vote_count_today >= user.can_vote_count_today():
raise NotEnoughLeftException(_('votes'), str(settings.MAX_VOTES_PER_DAY))
@@ -90,13 +109,11 @@ def vote_post(request, id, vote_type):
)
old_vote.cancel(ip=request.META['REMOTE_ADDR'])
- score_inc += (old_vote.__class__ == VoteDownAction) and 1 or -1
-
- if old_vote.__class__ != new_vote_cls:
- new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()
- score_inc += (new_vote_cls == VoteUpAction) and 1 or -1
- else:
+ score_inc = (old_vote.__class__ == VoteDownAction) and 1 or -1
vote_type = "none"
+ else:
+ new_vote_cls(user=user, node=post, ip=request.META['REMOTE_ADDR']).save()
+ score_inc = (new_vote_cls == VoteUpAction) and 1 or -1
response = {
'commands': {
@@ -105,7 +122,7 @@ def vote_post(request, id, vote_type):
}
}
- votes_left = (int(settings.MAX_VOTES_PER_DAY) - user_vote_count_today) + (vote_type == 'none' and -1 or 1)
+ votes_left = (user_can_vote_count_today - user_vote_count_today) + (vote_type == 'none' and -1 or 1)
if int(settings.START_WARN_VOTES_LEFT) >= votes_left:
response['message'] = _("You have %(nvotes)s %(tvotes)s left today.") % \
@@ -265,7 +282,9 @@ def comment(request, id):
id, comment.id, comment.comment, user.decorated_name, user.get_profile_url(),
reverse('delete_comment', kwargs={'id': comment.id}),
reverse('node_markdown', kwargs={'id': comment.id}),
- reverse('convert_comment', kwargs={'id': comment.id}),
+ reverse('convert_comment', kwargs={'id': comment.id}),
+ user.can_convert_comment_to_answer(comment),
+ bool(settings.SHOW_LATEST_COMMENTS_FIRST)
]
}
}
@@ -322,6 +341,21 @@ def accept_answer(request, id):
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}
@@ -408,8 +442,15 @@ def convert_to_comment(request, id):
answer = get_object_or_404(Answer, id=id)
question = answer.question
+ # Check whether the user has the required permissions
+ if not user.is_authenticated():
+ raise AnonymousNotAllowedException(_("convert answers to comments"))
+
+ if not user.can_convert_to_comment(answer):
+ raise NotEnoughRepPointsException(_("convert answers to comments"))
+
if not request.POST:
- description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': a.author.username,
+ description = lambda a: _("Answer by %(uname)s: %(snippet)s...") % {'uname': smart_unicode(a.author.username),
'snippet': a.summary[:10]}
nodes = [(question.id, _("Question"))]
[nodes.append((a.id, description(a))) for a in
@@ -417,12 +458,6 @@ def convert_to_comment(request, id):
return render_to_response('node/convert_to_comment.html', {'answer': answer, 'nodes': nodes})
- if not user.is_authenticated():
- raise AnonymousNotAllowedException(_("convert answers to comments"))
-
- if not user.can_convert_to_comment(answer):
- raise NotEnoughRepPointsException(_("convert answers to comments"))
-
try:
new_parent = Node.objects.get(id=request.POST.get('under', None))
except:
@@ -534,6 +569,10 @@ def matching_users(request):
def related_questions(request):
if request.POST and request.POST.get('title', None):
can_rank, questions = Question.objects.search(request.POST['title'])
+
+ if can_rank and isinstance(can_rank, basestring):
+ questions = questions.order_by(can_rank)
+
return HttpResponse(simplejson.dumps(
[dict(title=q.title, url=q.get_absolute_url(), score=q.score, summary=q.summary)
for q in questions.filter_state(deleted=False)[0:10]]), mimetype="application/json")
@@ -548,8 +587,16 @@ def answer_permanent_link(request, id):
# Getting the current object URL -- the Application URL + the object relative URL
url = '%s%s' % (settings.APP_BASE_URL, answer.get_absolute_url())
- # Display the template
- return render_to_response('node/permanent_link.html', { 'url' : url, })
+ if not request.POST:
+ # Display the template
+ return render_to_response('node/permanent_link.html', { 'url' : url, })
+
+ return {
+ 'commands' : {
+ 'copy_url' : [request.POST['permanent_link_url'],],
+ },
+ 'message' : _("The permanent URL to the answer has been copied to your clipboard."),
+ }
@decorate.withfn(command)
def award_points(request, user_id, answer_id):
@@ -571,15 +618,15 @@ def award_points(request, user_id, answer_id):
points = int(request.POST['points'])
# We should check if the user has enough reputation points, otherwise we raise an exception.
+ if points < 0:
+ raise CommandException(_("The number of points to award needs to be a positive value."))
+
if user.reputation < points:
raise NotEnoughRepPointsException(_("award"))
extra = dict(message=request.POST.get('message', ''), awarding_user=request.user.id, value=points)
# We take points from the awarding user
- BonusRepAction(user=request.user, extra=extra).save(data=dict(value=-points, affected=user))
-
- # And give them to the awarded one
- BonusRepAction(user=request.user, extra=extra).save(data=dict(value=points, affected=awarded_user))
+ AwardPointsAction(user=request.user, node=answer, extra=extra).save(data=dict(value=points, affected=awarded_user))
- return { 'message' : _("You have awarded %s with %d points") % (awarded_user, points) }
+ return { 'message' : _("You have awarded %(awarded_user)s with %(points)d points") % {'awarded_user' : awarded_user, 'points' : points} }