X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/554564294a9a644a3a6723c386f5eb009e23ce98..55eea8d5a3f8fcc3a509f2eaf45005bba20fc76a:/forum/models/user.py

diff --git a/forum/models/user.py b/forum/models/user.py
index 665c4d4..ae8f938 100644
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -162,7 +162,7 @@ class User(BaseModel, DjangoUser):
             if self.is_staff:
                 return u"%s \u2666" % username
 
-        return self.username
+        return username
 
     @property
     def last_activity(self):
@@ -205,15 +205,25 @@ class User(BaseModel, DjangoUser):
 
     @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'<a href="%s">%s</a>' % (self.get_profile_url(), self.username)
@@ -292,6 +302,13 @@ class User(BaseModel, DjangoUser):
         return self == comment.author or self.reputation >= int(settings.REP_TO_DELETE_COMMENTS)
 
     def can_convert_comment_to_answer(self, comment):
+        # 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)))