instead of "you can visit his profile" say "you can visit <username>'s profile"

[osqa.git] / forum / models / user.py

diff --git a/forum/models/user.py b/forum/models/user.py
index ab5941435b12ed06580972b2864be96334f8f01a..82cfe3aec3523d6bb177514d2a7a60e8f9e8cf10 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -3,7 +3,10 @@ from forum import const
 from django.contrib.contenttypes.models import ContentType\r
 from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser\r
 from django.db.models import Q\r
 from django.contrib.contenttypes.models import ContentType\r
 from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser\r
 from django.db.models import Q\r

-from hashlib import md5\r
+try:\r
+    from hashlib import md5\r
+except:\r
+    import md5\r

 import string\r
 from random import Random\r
 \r
 import string\r
 from random import Random\r
 \r


@@ -97,7 +100,7 @@ class User(BaseModel, DjangoUser):
 \r
     @property\r
     def gravatar(self):\r
 \r
     @property\r
     def gravatar(self):\r

-        return hashlib.md5(self.email).hexdigest()\r
+        return md5(self.email).hexdigest()\r

 \r
     def save(self, *args, **kwargs):\r
         if self.reputation < 0:\r
 \r
     def save(self, *args, **kwargs):\r
         if self.reputation < 0:\r


@@ -240,11 +243,8 @@ class Activity(GenericContent):
     @property\r
     def node(self):\r
         if self.activity_type in (const.TYPE_ACTIVITY_ANSWER, const.TYPE_ACTIVITY_ASK_QUESTION,\r
     @property\r
     def node(self):\r
         if self.activity_type in (const.TYPE_ACTIVITY_ANSWER, const.TYPE_ACTIVITY_ASK_QUESTION,\r

-                const.TYPE_ACTIVITY_MARK_ANSWER):\r
-            return self.content_object\r
-\r
-        if self.activity_type in (const.TYPE_ACTIVITY_COMMENT_QUESTION, const.TYPE_ACTIVITY_COMMENT_ANSWER):\r
-            return self.content_object.parent.leaf\r
+                const.TYPE_ACTIVITY_MARK_ANSWER, const.TYPE_ACTIVITY_COMMENT_QUESTION, const.TYPE_ACTIVITY_COMMENT_ANSWER):\r
+            return self.content_object.leaf\r

 \r
         if self.activity_type in (const.TYPE_ACTIVITY_UPDATE_ANSWER, const.TYPE_ACTIVITY_UPDATE_QUESTION):\r
             return self.content_object.node.leaf            \r
 \r
         if self.activity_type in (const.TYPE_ACTIVITY_UPDATE_ANSWER, const.TYPE_ACTIVITY_UPDATE_QUESTION):\r
             return self.content_object.node.leaf            \r