X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f4982393567a5f6827c12a089363d91338f9f13..55eea8d5a3f8fcc3a509f2eaf45005bba20fc76a:/forum/models/user.py diff --git a/forum/models/user.py b/forum/models/user.py index d96426e..ae8f938 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 @@ -131,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): @@ -150,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): @@ -193,22 +198,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) @@ -286,9 +301,16 @@ 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 @@ -474,9 +496,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