X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/c72f65e13db0229d8f5f74b69dc9bdba88d55d75..508b758ebf7d03317c1f1a14ba6006dd83eedd08:/forum/actions/node.py

diff --git a/forum/actions/node.py b/forum/actions/node.py
index 05d89ec..53699e9 100644
--- 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 _
 from forum.models.action import ActionProxy
 from forum.models import Comment, Question, Answer, NodeRevision
+import logging
 
 class NodeEditAction(ActionProxy):
     def create_revision_data(self, initial=False, **data):
@@ -179,19 +180,47 @@ class AnswerToCommentAction(ActionProxy):
             'question': self.describe_node(viewer, self.node.abs_parent),
         }
 
-class AnswerToQuestionAction(ActionProxy):
-    verb = _("converted to question")
+class CommentToAnswerAction(ActionProxy):
+    verb = _("converted")
 
-    def process_data(self, title):
-        self.node.node_type = "question"
-        self.node.title = title
+    def process_data(self, question):
+        self.node.parent = question
+        self.node.node_type = "answer"
         self.node.last_edited = self
         self.node.update_last_activity(self.user, save=True)
 
-        try:
-            self.node.abs_parent.reset_answer_count_cache()
-        except AttributeError:
-            pass
+        # Now updated the cached data
+        question.reset_answer_count_cache()
+
+    def describe(self, viewer=None):
+        return _("%(user)s converted comment on %(question)s into an answer") % {
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+            'question': self.describe_node(viewer, self.node.abs_parent),
+        }
+
+class AnswerToQuestionAction(NodeEditAction):
+    verb = _("converted to question")
+
+    def process_data(self,  **data):
+        revision_data = self.create_revision_data(**data)
+        revision = self.node.create_revision(self.user, **revision_data)
+
+        original_question = self.node.question
+
+        self.extra = {
+            'covert_revision': revision.revision,
+            'original_question': original_question
+        }
+
+        self.node.node_type = "question"
+        self.node.parent = None
+        self.node.abs_parent = None
+
+        original_question.reset_answer_count_cache()
+
+    def process_action(self):
+        self.node.last_edited = self
+        self.node.save()
 
 
     def describe(self, viewer=None):