last minute fix, bad import

[osqa.git] / forum / subscriptions.py

diff --git a/forum/subscriptions.py b/forum/subscriptions.py
index 7a5bf0684f6aa2d0ac161ad5b0eeef356e5c8b56..462e284c66a04878e6f218b2b0a24963fd333572 100644 (file)
--- a/forum/subscriptions.py
+++ b/forum/subscriptions.py
@@ -1,6 +1,7 @@
 import os\r
 import re\r
 import datetime\r
 import os\r
 import re\r
 import datetime\r

+import logging\r

 from forum.models import User, Question, Comment, QuestionSubscription, SubscriptionSettings, Answer\r
 from forum.utils.mail import send_template_email\r
 from django.utils.translation import ugettext as _\r
 from forum.models import User, Question, Comment, QuestionSubscription, SubscriptionSettings, Answer\r
 from forum.utils.mail import send_template_email\r
 from django.utils.translation import ugettext as _\r


@@ -110,10 +111,9 @@ def answer_accepted(action, new):
 \r
     subscribers = question.subscribers.filter(\r
             subscription_settings__enable_notifications=True,\r
 \r
     subscribers = question.subscribers.filter(\r
             subscription_settings__enable_notifications=True,\r

-            subscription_settings__notify_accepted=True,\r

             subscription_settings__subscribed_questions='i'\r
     ).exclude(id=action.node.nstate.accepted.by.id).distinct()\r
             subscription_settings__subscribed_questions='i'\r
     ).exclude(id=action.node.nstate.accepted.by.id).distinct()\r

-\r
+    \r

     subscribers = filter_subscribers(subscribers)\r
 \r
     send_template_email(subscribers, "notifications/answeraccepted.html", {'answer': action.node})\r
     subscribers = filter_subscribers(subscribers)\r
 \r
     send_template_email(subscribers, "notifications/answeraccepted.html", {'answer': action.node})\r


@@ -176,4 +176,4 @@ QuestionViewAction.hook(question_viewed)
 #\r
 #            q_author.message_set.create(message=msg)\r
 #\r
 #\r
 #            q_author.message_set.create(message=msg)\r
 #\r

-#post_save.connect(record_answer_event, sender=Answer)
\ No newline at end of file
+#post_save.connect(record_answer_event, sender=Answer)\r