X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b8f3a2323d03384198863e35d6467a8624a2e31a..4b20a67ddb4ebea2c6e09d51ee48da5a856edef8:/forum/actions/node.py?ds=sidebyside

diff --git a/forum/actions/node.py b/forum/actions/node.py
index 931b6e1..dbbb658 100644
--- a/forum/actions/node.py
+++ b/forum/actions/node.py
@@ -42,7 +42,7 @@ class AnswerAction(NodeEditAction):
 
     def describe(self, viewer=None):
         question = self.node.parent
-        return _("%(user)s answered %(asker)s %(question)s") % {
+        return _("%(user)s answered %(asker)s on %(question)s") % {
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
             'asker': self.hyperlink(question.author.get_profile_url(), self.friendly_username(viewer, question.author)),
             'question': self.hyperlink(self.node.get_absolute_url(), question.title)
@@ -134,13 +134,14 @@ class CloseAction(ActionProxy):
     verb = _("closed")
 
     def process_action(self):
-        self.node.extra_action = self
         self.node.marked = True
+        self.node.nstate.closed = self
+        self.node.last_edited = self
         self.node.update_last_activity(self.user, save=True)
 
     def cancel_action(self):
-        self.node.extra_action = None
         self.node.marked = False
+        self.node.nstate.closed = None
         self.node.update_last_activity(self.user, save=True)
 
     def describe(self, viewer=None):
@@ -148,4 +149,47 @@ class CloseAction(ActionProxy):
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
             'post_desc': self.describe_node(viewer, self.node),
             'reason': self.extra
-        }
\ No newline at end of file
+        }
+
+class AnswerToCommentAction(ActionProxy):
+    verb = _("converted")
+
+    def process_data(self, new_parent=None):
+        self.node.parent = new_parent
+        self.node.node_type = "comment"
+
+        for comment in self.node.comments.all():
+            comment.parent = new_parent
+            comment.save()
+
+        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
+
+    def describe(self, viewer=None):
+        return _("%(user)s converted an answer to %(question)s into a comment") % {
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+            'question': self.describe_node(viewer, self.node.abs_parent),
+        }
+
+class WikifyAction(ActionProxy):
+    verb = _("wikified")
+
+    def process_action(self):
+        self.node.nstate.wiki = self
+        self.node.last_edited = self
+        self.node.update_last_activity(self.user, save=True)
+
+    def cancel_action(self):
+        self.node.nstate.wiki = None
+        self.node.update_last_activity(self.user, save=True)
+
+    def describe(self, viewer=None):
+        return _("%(user)s marked %(node)s as community wiki.") % {
+            'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
+            'node': self.describe_node(viewer, self.node),
+        }
+