diff options
Diffstat (limited to 'forum/views')
| -rw-r--r-- | forum/views/commands.py | 16 | ||||
| -rw-r--r-- | forum/views/readers.py | 1 | ||||
| -rw-r--r-- | forum/views/users.py | 3 | ||||
| -rw-r--r-- | forum/views/writers.py | 1 |
4 files changed, 13 insertions, 8 deletions
diff --git a/forum/views/commands.py b/forum/views/commands.py index b5dbec56..2905426c 100644 --- a/forum/views/commands.py +++ b/forum/views/commands.py @@ -1,5 +1,7 @@ import datetime +#todo: maybe eliminate usage of django.settings from django.conf import settings +from forum.conf import settings as forum_settings from django.utils import simplejson from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, render_to_response @@ -138,7 +140,8 @@ def vote(request, id):#todo: pretty incomprehensible view used by various ajax c vote = post.votes.filter(user=request.user)[0] # get latest vote by the current user # unvote should be less than certain time - if (datetime.datetime.now().day - vote.voted_at.day) >= auth.VOTE_RULES['scope_deny_unvote_days'].value: + if (datetime.datetime.now().day - vote.voted_at.day) \ + >= forum_settings.MAX_DAYS_TO_CANCEL_VOTE: response_data['status'] = 2 else: voted = vote.vote @@ -152,7 +155,8 @@ def vote(request, id):#todo: pretty incomprehensible view used by various ajax c response_data['status'] = 1 response_data['count'] = post.score - elif Vote.objects.get_votes_count_today_from_user(request.user) >= auth.VOTE_RULES['scope_votes_per_user_per_day'].value: + elif Vote.objects.get_votes_count_today_from_user(request.user)\ + >= forum_settings.MAX_VOTES_PER_USER_PER_DAY: response_data['allowed'] = -3 else: vote = Vote(user=request.user, content_object=post, vote=vote_score, voted_at=datetime.datetime.now()) @@ -163,8 +167,10 @@ def vote(request, id):#todo: pretty incomprehensible view used by various ajax c # downvote auth.onDownVoted(vote, post, request.user) - votes_left = auth.VOTE_RULES['scope_votes_per_user_per_day'].value - Vote.objects.get_votes_count_today_from_user(request.user) - if votes_left <= auth.VOTE_RULES['scope_warn_votes_left'].value: + votes_left = forum_settings.MAX_VOTES_PER_USER_PER_DAY \ + - Vote.objects.get_votes_count_today_from_user(request.user) + if votes_left <= \ + forum_settings.VOTES_LEFT_WARNING_THRESHOLD: response_data['message'] = u'%s votes left' % votes_left response_data['count'] = post.score elif vote_type in ['7', '8']: @@ -174,7 +180,7 @@ def vote(request, id):#todo: pretty incomprehensible view used by various ajax c post_id = request.POST.get('postId') post = get_object_or_404(Answer, id=post_id) - if FlaggedItem.objects.get_flagged_items_count_today(request.user) >= auth.VOTE_RULES['scope_flags_per_user_per_day'].value: + if FlaggedItem.objects.get_flagged_items_count_today(request.user) >= forum_settings.MAX_FLAGS_PER_USER_PER_DAY: response_data['allowed'] = -3 elif not auth.can_flag_offensive(request.user): response_data['allowed'] = -2 diff --git a/forum/views/readers.py b/forum/views/readers.py index 338da62b..cd5522aa 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -21,7 +21,6 @@ from markdown2 import Markdown from forum.utils.diff import textDiff as htmldiff from forum.forms import * from forum.models import * -from forum.auth import * from forum.const import * from forum import const from forum import auth diff --git a/forum/views/users.py b/forum/views/users.py index 5fb97ef9..a8b9398d 100644 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -19,6 +19,7 @@ from django.contrib.contenttypes.models import ContentType from forum.models import user_updated from forum.const import USERS_PAGE_SIZE from django.conf import settings +from forum.conf import settings as forum_settings question_type = ContentType.objects.get_for_model(Question) answer_type = ContentType.objects.get_for_model(Answer) @@ -218,7 +219,7 @@ def user_stats(request, user_id, user_view): up_votes = Vote.objects.get_up_vote_count_from_user(user) down_votes = Vote.objects.get_down_vote_count_from_user(user) votes_today = Vote.objects.get_votes_count_today_from_user(user) - votes_total = auth.VOTE_RULES['scope_votes_per_user_per_day'].value + votes_total = forum_settings.MAX_VOTES_PER_USER_PER_DAY question_id_set = set(map(lambda v: v['id'], list(questions))) \ | set(map(lambda v: v['id'], list(answered_questions))) diff --git a/forum/views/writers.py b/forum/views/writers.py index 86831ba3..eddf2a87 100644 --- a/forum/views/writers.py +++ b/forum/views/writers.py @@ -15,7 +15,6 @@ from django.core.exceptions import PermissionDenied from forum.forms import * from forum.models import * -from forum.auth import * from forum.const import * from forum import auth from forum.utils.forms import get_next_url |