Added functionality to convert answers to comments as mentioned in Jira OSQA-462.

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

diff --git a/forum/models/user.py b/forum/models/user.py
index b18047e9295ccb208b18293cad1c188ef12e7bc6..e50c1f0843e8c50ddd2da692f49f9181e328740e 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -159,7 +159,7 @@ class User(BaseModel, DjangoUser):
         try:
             return self.actions.order_by('-action_date')[0].action_date
         except:
-            return None
+            return self.last_seen
 
     @property
     def gravatar(self):
@@ -279,6 +279,10 @@ class User(BaseModel, DjangoUser):
     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
                 (settings.REP_TO_CONVERT_TO_COMMENT))
+    
+    def can_convert_to_question(self, answer):
+        return (not answer.marked) and (self.is_superuser or self.is_staff or answer.author == self or self.reputation >= int
+                (settings.REP_TO_CONVERT_TO_QUESTION))
 
     @true_if_is_super_or_staff
     def can_accept_answer(self, answer):