summaryrefslogtreecommitdiffstats
path: root/askbot
diff options
context:
space:
mode:
authorVasil Vangelovski <vvangelovski@gmail.com>2012-01-19 00:08:53 +0100
committerVasil Vangelovski <vvangelovski@gmail.com>2012-01-19 00:08:53 +0100
commitd9958a6244e587996cec0f698141c432ee9ee7fa (patch)
tree3acd35b226edb39ec6d243f3b272aa5ed8b8d2b3 /askbot
parentb8e6e0f93ff70f7d846604969c38c54697ad448a (diff)
downloadaskbot-d9958a6244e587996cec0f698141c432ee9ee7fa.tar.gz
askbot-d9958a6244e587996cec0f698141c432ee9ee7fa.tar.bz2
askbot-d9958a6244e587996cec0f698141c432ee9ee7fa.zip
Fixed posting replies to comments by email
Diffstat (limited to 'askbot')
-rw-r--r--askbot/models/reply_by_email.py4
-rw-r--r--askbot/tests/reply_by_email_tests.py1
2 files changed, 4 insertions, 1 deletions
diff --git a/askbot/models/reply_by_email.py b/askbot/models/reply_by_email.py
index 43d5905d..5c92f0a6 100644
--- a/askbot/models/reply_by_email.py
+++ b/askbot/models/reply_by_email.py
@@ -44,7 +44,7 @@ class ReplyAddress(models.Model):
def create_reply(self, content):
result = None
- if self.post.post_type == 'answer' or self.post.post_type == 'comment':
+ if self.post.post_type == 'answer':
result = self.user.post_comment(self.post, content)
elif self.post.post_type == 'question':
wordcount = len(content.rsplit())
@@ -52,6 +52,8 @@ class ReplyAddress(models.Model):
result = self.user.post_answer(self.post, content)
else:
result = self.user.post_comment(self.post, content)
+ elif self.post.post_type == 'comment':
+ result = self.user.post_comment(self.post.parent, content)
self.used_at = datetime.now()
self.save()
return result
diff --git a/askbot/tests/reply_by_email_tests.py b/askbot/tests/reply_by_email_tests.py
index 68aeda35..6aca55ec 100644
--- a/askbot/tests/reply_by_email_tests.py
+++ b/askbot/tests/reply_by_email_tests.py
@@ -92,6 +92,7 @@ class ReplyAddressModelTests(AskbotTestCase):
post = result.create_reply("A test reply")
self.assertEquals(post.post_type, "comment")
self.assertEquals(post.text, "A test reply")
+ self.assertEquals(self.answer.comments.count(), 2)
def test_create_question_comment_reply(self):