X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/13bee2f2e6aea2d936909861f3ab60bb09821a60..4da66439c7e1cd073b2f97466208730cf5db9dff:/forum/models/user.py?ds=sidebyside diff --git a/forum/models/user.py b/forum/models/user.py index 9d63248..e73244d 100644 --- a/forum/models/user.py +++ b/forum/models/user.py @@ -4,10 +4,10 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned from django.contrib.contenttypes.models import ContentType from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser from django.db.models import Q -try: - from hashlib import md5 -except: - from md5 import new as md5 + +from django.utils.encoding import smart_unicode + +from forum.settings import TRUNCATE_LONG_USERNAMES, TRUNCATE_USERNAMES_LONGER_THAN import string from random import Random @@ -15,12 +15,6 @@ from random import Random from django.utils.translation import ugettext as _ import logging -QUESTIONS_PER_PAGE_CHOICES = ( -(10, u'10'), -(30, u'30'), -(50, u'50'), -) - class AnonymousUser(DjangoAnonymousUser): reputation = 0 @@ -119,7 +113,7 @@ class User(BaseModel, DjangoUser): is_approved = models.BooleanField(default=False) email_isvalid = models.BooleanField(default=False) - reputation = models.PositiveIntegerField(default=0) + reputation = models.IntegerField(default=0) gold = models.PositiveIntegerField(default=0) silver = models.PositiveIntegerField(default=0) bronze = models.PositiveIntegerField(default=0) @@ -137,7 +131,7 @@ class User(BaseModel, DjangoUser): vote_down_count = DenormalizedField("actions", canceled=False, action_type="votedown") def __unicode__(self): - return self.username + return smart_unicode(self.username) @property def prop(self): @@ -156,14 +150,19 @@ class User(BaseModel, DjangoUser): @property def decorated_name(self): + username = smart_unicode(self.username) + + if len(username) > TRUNCATE_USERNAMES_LONGER_THAN and TRUNCATE_LONG_USERNAMES: + username = '%s...' % username[:TRUNCATE_USERNAMES_LONGER_THAN-3] + if settings.SHOW_STATUS_DIAMONDS: if self.is_superuser: - return u"%s \u2666\u2666" % self.username + return u"%s \u2666\u2666" % username if self.is_staff: - return u"%s \u2666" % self.username + return u"%s \u2666" % username - return self.username + return username @property def last_activity(self): @@ -177,7 +176,8 @@ class User(BaseModel, DjangoUser): return md5(self.email.lower()).hexdigest() def save(self, *args, **kwargs): - if self.reputation < 0: + # If the community doesn't allow negative reputation, set it to 0 + if not settings.ALLOW_NEGATIVE_REPUTATION and self.reputation < 0: self.reputation = 0 new = not bool(self.id) @@ -188,9 +188,6 @@ class User(BaseModel, DjangoUser): sub_settings = SubscriptionSettings(user=self) sub_settings.save() - def get_absolute_url(self): - return self.get_profile_url() - def get_messages(self): messages = [] for m in self.message_set.all(): @@ -202,22 +199,32 @@ class User(BaseModel, DjangoUser): @models.permalink def get_profile_url(self): - return ('user_profile', (), {'id': self.id, 'slug': slugify(self.username)}) + return ('user_profile', (), {'id': self.id, 'slug': slugify(smart_unicode(self.username))}) def get_absolute_url(self): return self.get_profile_url() @models.permalink def get_asked_url(self): - return ('user_questions', (), {'mode': _('asked-by'), 'user': self.id, 'slug': slugify(self.username)}) + return ('user_questions', (), {'mode': _('asked-by'), 'user': self.id, 'slug': slugify(smart_unicode(self.username))}) + + @models.permalink + def get_user_subscriptions_url(self): + return ('user_subscriptions', (), { 'id': self.id, 'slug': slugify(smart_unicode(self.username))}) @models.permalink def get_answered_url(self): return ('user_questions', (), {'mode': _('answered-by'), 'user': self.id, 'slug': slugify(self.username)}) - @models.permalink def get_subscribed_url(self): - return ('user_questions', (), {'mode': _('subscribed-by'), 'user': self.id, 'slug': slugify(self.username)}) + try: + # Try to retrieve the Subscribed User URL. + url = reverse('user_questions', + kwargs={'mode': _('subscribed-by'), 'user': self.id, 'slug': slugify(smart_unicode(self.username))}) + return url + except Exception, e: + # If some Exception has been raised, don't forget to log it. + logging.error("Error retrieving a subscribed user URL: %s" % e) def get_profile_link(self): profile_link = u'%s' % (self.get_profile_url(), self.username) @@ -295,16 +302,23 @@ class User(BaseModel, DjangoUser): def can_delete_comment(self, comment): return self == comment.author or self.reputation >= int(settings.REP_TO_DELETE_COMMENTS) - @true_if_is_super_or_staff def can_convert_comment_to_answer(self, comment): - return self == comment.author or self.reputation >= int(settings.REP_TO_CONVERT_COMMENTS_TO_ANSWERS) + # We need to know what is the comment parent node type. + comment_parent_type = comment.parent.node_type + + # If the parent is not a question or an answer this comment cannot be converted to an answer. + if comment_parent_type != "question" and comment_parent_type != "answer": + return False + + return (comment.parent.node_type in ('question', 'answer')) and (self.is_superuser or self.is_staff or ( + self == comment.author) or (self.reputation >= int(settings.REP_TO_CONVERT_COMMENTS_TO_ANSWERS))) def can_convert_to_comment(self, answer): return (not answer.marked) and (self.is_superuser or self.is_staff or answer.author == self or self.reputation >= int (settings.REP_TO_CONVERT_TO_COMMENT)) - def can_convert_to_question(self, answer): - return (not answer.marked) and (self.is_superuser or self.is_staff or answer.author == self or self.reputation >= int + def can_convert_to_question(self, node): + return (not node.marked) and (self.is_superuser or self.is_staff or node.author == self or self.reputation >= int (settings.REP_TO_CONVERT_TO_QUESTION)) @true_if_is_super_or_staff @@ -483,9 +497,6 @@ class SubscriptionSettings(models.Model): #auto_subscribe_to all_questions = models.BooleanField(default=False) all_questions_watched_tags = models.BooleanField(default=False) - questions_asked = models.BooleanField(default=True) - questions_answered = models.BooleanField(default=True) - questions_commented = models.BooleanField(default=False) questions_viewed = models.BooleanField(default=False) #notify activity on subscribed