X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0f2d00f9d7d5d28149707f66c719b28edfe51aed..6f9524a34c490d43db43a1ae4b44b40d77ce691a:/forum/models/user.py

diff --git a/forum/models/user.py b/forum/models/user.py
index 5366631..82cfe3a 100644
--- 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
 from django.contrib.auth.models import User as DjangoUser, AnonymousUser as DjangoAnonymousUser
 from django.db.models import Q
-from hashlib import md5
+try:
+    from hashlib import md5
+except:
+    import md5
 import string
 from random import Random
 
@@ -97,7 +100,7 @@ class User(BaseModel, DjangoUser):
 
     @property
     def gravatar(self):
-        return hashlib.md5(self.email).hexdigest()
+        return md5(self.email).hexdigest()
 
     def save(self, *args, **kwargs):
         if self.reputation < 0:
@@ -240,12 +243,11 @@ class Activity(GenericContent):
     @property
     def node(self):
         if self.activity_type in (const.TYPE_ACTIVITY_ANSWER, const.TYPE_ACTIVITY_ASK_QUESTION,
-                const.TYPE_ACTIVITY_MARK_ANSWER, const.TYPE_ACTIVITY_UPDATE_QUESTION):
-            return self.content_object
+                const.TYPE_ACTIVITY_MARK_ANSWER, const.TYPE_ACTIVITY_COMMENT_QUESTION, const.TYPE_ACTIVITY_COMMENT_ANSWER):
+            return self.content_object.leaf
 
-        if self.activity_type in (const.TYPE_ACTIVITY_COMMENT_QUESTION,
-                const.TYPE_ACTIVITY_COMMENT_ANSWER, const.TYPE_ACTIVITY_UPDATE_ANSWER):
-            return self.content_object.node.leaf
+        if self.activity_type in (const.TYPE_ACTIVITY_UPDATE_ANSWER, const.TYPE_ACTIVITY_UPDATE_QUESTION):
+            return self.content_object.node.leaf            
             
         raise NotImplementedError()