Fixes OSQA 276, Sidebar link to edit my subscriptions is wrong.

[osqa.git] / forum / subscriptions.py

diff --git a/forum/subscriptions.py b/forum/subscriptions.py
index 4dc8f34dcf88df57dc54dfc748b473525fbf8442..45f430fb78e217ebf1692ab0ebb8d3604de8b273 100644 (file)
--- a/forum/subscriptions.py
+++ b/forum/subscriptions.py
@@ -5,7 +5,7 @@ from forum.models import User, Question, Comment, QuestionSubscription, Subscrip
 from forum.utils.mail import send_email\r
 from django.utils.translation import ugettext as _\r
 from forum.actions import AskAction, AnswerAction, CommentAction, AcceptAnswerAction, UserJoinsAction, QuestionViewAction\r
-from django.conf import settings\r
+from forum import settings\r
 from django.db.models import Q, F\r
 \r
 def create_subscription_if_not_exists(question, user):\r
@@ -124,7 +124,7 @@ def answer_accepted(action, new):
             subscription_settings__enable_notifications=True,\r
             subscription_settings__notify_accepted=True,\r
             subscription_settings__subscribed_questions='i'\r
-    ).exclude(id=instance.accepted_by.id).distinct()\r
+    ).exclude(id=action.node.accepted.by.id).distinct()\r
     recipients = create_recipients_dict(subscribers)\r
 \r
     send_email(settings.EMAIL_SUBJECT_PREFIX + _("An answer to '%(question_title)s' was accepted") % dict(question_title=question.title),\r
@@ -144,7 +144,7 @@ def member_joined(action, new):
 \r
     recipients = create_recipients_dict(subscribers)\r
 \r
-    send_email(settings.EMAIL_SUBJECT_PREFIX + _("%(username)s is a new member on %(app_name)s") % dict(username=instance.username, app_name=settings.APP_SHORT_NAME),\r
+    send_email(settings.EMAIL_SUBJECT_PREFIX + _("%(username)s is a new member on %(app_name)s") % dict(username=action.user.username, app_name=settings.APP_SHORT_NAME),\r
                recipients, "notifications/newmember.html", {\r
         'newmember': action.user,\r
     }, threaded=False)\r