X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/410bfa05ee36ed1d99356c443a5f3f6aa3ee9578..aedb39383100b0ae2613c2f3beee6d397cd560d4:/forum/subscriptions.py

diff --git a/forum/subscriptions.py b/forum/subscriptions.py
index e943d2d..45f430f 100644
--- 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
 from django.utils.translation import ugettext as _
 from forum.actions import AskAction, AnswerAction, CommentAction, AcceptAnswerAction, UserJoinsAction, QuestionViewAction
-from django.conf import settings
+from forum import settings
 from django.db.models import Q, F
 
 def create_subscription_if_not_exists(question, user):
@@ -124,7 +124,7 @@ def answer_accepted(action, new):
             subscription_settings__enable_notifications=True,
             subscription_settings__notify_accepted=True,
             subscription_settings__subscribed_questions='i'
-    ).exclude(id=instance.accepted_by.id).distinct()
+    ).exclude(id=action.node.accepted.by.id).distinct()
     recipients = create_recipients_dict(subscribers)
 
     send_email(settings.EMAIL_SUBJECT_PREFIX + _("An answer to '%(question_title)s' was accepted") % dict(question_title=question.title),
@@ -144,7 +144,7 @@ def member_joined(action, new):
 
     recipients = create_recipients_dict(subscribers)
 
-    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),
+    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),
                recipients, "notifications/newmember.html", {
         'newmember': action.user,
     }, threaded=False)
@@ -156,12 +156,12 @@ def question_viewed(action, new):
         return
 
     try:
-        subscription = QuestionSubscription.objects.get(question=action.question, user=action.viewuser)
+        subscription = QuestionSubscription.objects.get(question=action.node, user=action.viewuser)
         subscription.last_view = datetime.datetime.now()
         subscription.save()
     except:
         if action.viewuser.subscription_settings.questions_viewed:
-            subscription = QuestionSubscription(question=action.question, user=action.viewuser)
+            subscription = QuestionSubscription(question=action.node, user=action.viewuser)
             subscription.save()
 
 QuestionViewAction.hook(question_viewed)