Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / subscriptions.py

diff --git a/forum/subscriptions.py b/forum/subscriptions.py
index 7a5bf0684f6aa2d0ac161ad5b0eeef356e5c8b56..e897e4eebb486e917a75c776b004156a661bf1a8 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


@@ -37,9 +38,8 @@ def question_posted(action, new):
 \r
     send_template_email(subscribers, "notifications/newquestion.html", {'question': question})\r
 \r
 \r
     send_template_email(subscribers, "notifications/newquestion.html", {'question': question})\r
 \r

-    if question.author.subscription_settings.questions_asked:\r
-        subscription = QuestionSubscription(question=question, user=question.author)\r
-        subscription.save()\r
+    subscription = QuestionSubscription(question=question, user=question.author)\r
+    subscription.save()\r

 \r
     new_subscribers = User.objects.filter(\r
             Q(subscription_settings__all_questions=True) |\r
 \r
     new_subscribers = User.objects.filter(\r
             Q(subscription_settings__all_questions=True) |\r


@@ -67,8 +67,7 @@ def answer_posted(action, new):
 \r
     send_template_email(subscribers, "notifications/newanswer.html", {'answer': answer})\r
 \r
 \r
     send_template_email(subscribers, "notifications/newanswer.html", {'answer': answer})\r
 \r

-    if answer.author.subscription_settings.questions_answered:\r
-        create_subscription_if_not_exists(question, answer.author)\r
+    create_subscription_if_not_exists(question, answer.author)\r

 \r
 AnswerAction.hook(answer_posted)\r
 \r
 \r
 AnswerAction.hook(answer_posted)\r
 \r


@@ -99,8 +98,7 @@ def comment_posted(action, new):
 \r
     send_template_email(subscribers, "notifications/newcomment.html", {'comment': comment})\r
 \r
 \r
     send_template_email(subscribers, "notifications/newcomment.html", {'comment': comment})\r
 \r

-    if comment.user.subscription_settings.questions_commented:\r
-        create_subscription_if_not_exists(question, comment.user)\r
+    create_subscription_if_not_exists(question, comment.user)\r

 \r
 CommentAction.hook(comment_posted)\r
 \r
 \r
 CommentAction.hook(comment_posted)\r
 \r


@@ -110,10 +108,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 +173,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