Django 1.3 fix.

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

diff --git a/forum/actions/node.py b/forum/actions/node.py
index 05d89eca09db4553c5327c8b0bbcc0f55db9389a..263839a136e79a47fa38ae1c6371ed92421813af 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
@@ -179,19 +180,45 @@ class AnswerToCommentAction(ActionProxy):
             'question': self.describe_node(viewer, self.node.abs_parent),\r
         }\r
 \r
-class AnswerToQuestionAction(ActionProxy):\r
-    verb = _("converted to question")\r
+class CommentToAnswerAction(ActionProxy):\r
+    verb = _("converted")\r
 \r
-    def process_data(self, title):\r
-        self.node.node_type = "question"\r
-        self.node.title = title\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
-        try:\r
-            self.node.abs_parent.reset_answer_count_cache()\r
-        except AttributeError:\r
-            pass\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