fixes osqa-188 - localizes the word 'Login' in openidurl.html

[osqa.git] / forum_modules / default_badges / badges.py

diff --git a/forum_modules/default_badges/badges.py b/forum_modules/default_badges/badges.py
index 057d2ceef22682e1f5a98f7434dd00c5f46481bc..eed611c066f732e5dc8ad33e62f00c462f421eea 100644 (file)
--- a/forum_modules/default_badges/badges.py
+++ b/forum_modules/default_badges/badges.py
@@ -7,6 +7,7 @@ from forum.badges.base import PostCountableAbstractBadge, ActivityAbstractBadge,
         ActivityCountAbstractBadge, CountableAbstractBadge, AbstractBadge, NodeCountableAbstractBadge
 from forum.models import Node, Question, Answer, Activity, Tag
 from forum.models.user import activity_record
         ActivityCountAbstractBadge, CountableAbstractBadge, AbstractBadge, NodeCountableAbstractBadge
 from forum.models import Node, Question, Answer, Activity, Tag
 from forum.models.user import activity_record

+from forum.models.base import denorm_update

 from forum import const
 
 import settings
 from forum import const
 
 import settings


@@ -237,22 +238,21 @@ class TeacherBadge(CountableAbstractBadge):
 class AcceptedAndVotedAnswerAbstractBadge(AbstractBadge):
     def __init__(self, up_votes, handler):
         def wrapper(sender, instance, **kwargs):
 class AcceptedAndVotedAnswerAbstractBadge(AbstractBadge):
     def __init__(self, up_votes, handler):
         def wrapper(sender, instance, **kwargs):

-            if sender is Node:
-                if not (instance.node_type == "answer" and "vote_up_count" in instance.get_dirty_fields()):
+            if sender is Answer:
+                if (not kwargs['field'] == "score") or (kwargs['new'] < kwargs['old']):

                     return
 
                 answer = instance.leaf
                     return
 
                 answer = instance.leaf

+                vote_count = kwargs['new']

             else:
                 answer = instance.content_object
             else:
                 answer = instance.content_object

+                vote_count = answer.vote_up_count

 
 

-            accepted = answer.accepted
-            vote_count = answer.vote_up_count
-
-            if accepted and vote_count == up_votes:
+            if answer.accepted and vote_count == up_votes:

                 handler(answer)
 
         activity_record.connect(wrapper, sender=const.TYPE_ACTIVITY_MARK_ANSWER, weak=False)
                 handler(answer)
 
         activity_record.connect(wrapper, sender=const.TYPE_ACTIVITY_MARK_ANSWER, weak=False)

-        post_save.connect(wrapper, sender=Node, weak=False)
+        denorm_update.connect(wrapper, sender=Node, weak=False)

 
 
 class EnlightenedBadge(AcceptedAndVotedAnswerAbstractBadge):
 
 
 class EnlightenedBadge(AcceptedAndVotedAnswerAbstractBadge):