Accepting incoming merge of the jambazov feature branch. Mostly includes new bug...

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

diff --git a/forum/models/user.py b/forum/models/user.py
index e3c97fa90d6bf4f61cd30d41bdc432a95d2652fc..9d6324875f9273c6d9ab5da77290f7bb5c4645e9 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -22,6 +22,8 @@ QUESTIONS_PER_PAGE_CHOICES = (
 )
 
 class AnonymousUser(DjangoAnonymousUser):
+    reputation = 0
+    
     def get_visible_answers(self, question):
         return question.answers.filter_state(deleted=False)
 
@@ -33,6 +35,9 @@ class AnonymousUser(DjangoAnonymousUser):
 
     def can_vote_down(self):
         return False
+    
+    def can_vote_count_today(self):
+        return 0
 
     def can_flag_offensive(self, post=None):
         return False
@@ -54,6 +59,12 @@ class AnonymousUser(DjangoAnonymousUser):
 
     def can_convert_to_comment(self, answer):
         return False
+    
+    def can_convert_to_question(self, answer):
+        return False
+    
+    def can_convert_comment_to_answer(self, comment):
+        return False
 
     def can_accept_answer(self, answer):
         return False
@@ -232,7 +243,15 @@ class User(BaseModel, DjangoUser):
         today = datetime.date.today()
         return self.actions.filter(canceled=False, action_type="flag",
                                    action_date__gte=(today - datetime.timedelta(days=1))).count()
-
+    
+    def can_vote_count_today(self):
+        votes_today = settings.MAX_VOTES_PER_DAY
+        
+        if settings.USER_REPUTATION_TO_MAX_VOTES:
+            votes_today = votes_today + int(self.reputation)
+        
+        return votes_today
+    
     @true_if_is_super_or_staff
     def can_view_deleted_post(self, post):
         return post.author == self
@@ -278,7 +297,7 @@ class User(BaseModel, DjangoUser):
 
     @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_COMMENTS_TO_ANSWERS)
+        return 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