merging cacheimp -> trunk

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

diff --git a/forum/models/user.py b/forum/models/user.py
index f8c91d65f10a11fddbfc61f917d1c60ddb2b1650..699c7bc5ed015531bf77630f6381d01be8580a6d 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -4,10 +4,6 @@ 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
 
 import string
 from random import Random
@@ -286,9 +282,9 @@ 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)
+        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