#OSQA-581, resetting the answer count cache after the comment has been converted...

[osqa.git] / forum / actions / node.py

diff --git a/forum/actions/node.py b/forum/actions/node.py
index d3057a9b2c35e35895a81e4de00b480c1cba2b78..53699e967d1e91f83673274d9e28502667bdb5d7 100644 (file)
--- a/forum/actions/node.py
+++ b/forum/actions/node.py
@@ -2,6 +2,7 @@ from django.utils.html import strip_tags
 from django.utils.translation import ugettext as _\r
 from forum.models.action import ActionProxy\r
 from forum.models import Comment, Question, Answer, NodeRevision\r
+import logging\r
 \r
 class NodeEditAction(ActionProxy):\r
     def create_revision_data(self, initial=False, **data):\r
@@ -19,7 +20,11 @@ class AskAction(NodeEditAction):
     verb = _("asked")\r
 \r
     def process_data(self, **data):\r
-        question = Question(author=self.user, **self.create_revision_data(True, **data))\r
+        processed_data = self.create_revision_data(True, **data)\r
+        if 'added_at' in data:\r
+            processed_data['added_at'] = data['added_at']\r
+\r
+        question = Question(author=self.user, **processed_data)\r
         question.save()\r
         self.node = question\r
 \r
@@ -42,7 +47,7 @@ class AnswerAction(NodeEditAction):
 \r
     def describe(self, viewer=None):\r
         question = self.node.parent\r
-        return _("%(user)s answered %(asker)s %(question)s") % {\r
+        return _("%(user)s answered %(asker)s on %(question)s") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
             'asker': self.hyperlink(question.author.get_profile_url(), self.friendly_username(viewer, question.author)),\r
             'question': self.hyperlink(self.node.get_absolute_url(), question.title)\r
@@ -136,6 +141,7 @@ class CloseAction(ActionProxy):
     def process_action(self):\r
         self.node.marked = True\r
         self.node.nstate.closed = self\r
+        self.node.last_edited = self\r
         self.node.update_last_activity(self.user, save=True)\r
 \r
     def cancel_action(self):\r
@@ -174,6 +180,55 @@ class AnswerToCommentAction(ActionProxy):
             'question': self.describe_node(viewer, self.node.abs_parent),\r
         }\r
 \r
+class CommentToAnswerAction(ActionProxy):\r
+    verb = _("converted")\r
+\r
+    def process_data(self, question):\r
+        self.node.parent = question\r
+        self.node.node_type = "answer"\r
+        self.node.last_edited = self\r
+        self.node.update_last_activity(self.user, save=True)\r
+\r
+        # Now updated the cached data\r
+        question.reset_answer_count_cache()\r
+\r
+    def describe(self, viewer=None):\r
+        return _("%(user)s converted comment on %(question)s into an answer") % {\r
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
+            'question': self.describe_node(viewer, self.node.abs_parent),\r
+        }\r
+\r
+class AnswerToQuestionAction(NodeEditAction):\r
+    verb = _("converted to question")\r
+\r
+    def process_data(self,  **data):\r
+        revision_data = self.create_revision_data(**data)\r
+        revision = self.node.create_revision(self.user, **revision_data)\r
+\r
+        original_question = self.node.question\r
+\r
+        self.extra = {\r
+            'covert_revision': revision.revision,\r
+            'original_question': original_question\r
+        }\r
+\r
+        self.node.node_type = "question"\r
+        self.node.parent = None\r
+        self.node.abs_parent = None\r
+\r
+        original_question.reset_answer_count_cache()\r
+\r
+    def process_action(self):\r
+        self.node.last_edited = self\r
+        self.node.save()\r
+\r
+\r
+    def describe(self, viewer=None):\r
+        return _("%(user)s converted an answer to %(question)s into a separate question") % {\r
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
+            'question': self.describe_node(viewer, self.node.abs_parent),\r
+        }\r
+\r
 class WikifyAction(ActionProxy):\r
     verb = _("wikified")\r
 \r
@@ -187,7 +242,7 @@ class WikifyAction(ActionProxy):
         self.node.update_last_activity(self.user, save=True)\r
 \r
     def describe(self, viewer=None):\r
-        return _("%(user)s marked %(node)s as community wiky.") % {\r
+        return _("%(user)s marked %(node)s as community wiki.") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
             'node': self.describe_node(viewer, self.node),\r
         }\r