Should fix the error reported in http://meta.osqa.net/questions/4753/bulk-management...

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

diff --git a/forum/actions/node.py b/forum/actions/node.py
index f5aad160ec6535f835478a26ed4d7704cd637f54..50e4ef13060ff5eb9064537d2a1c679c6f952dae 100644 (file)
--- a/forum/actions/node.py
+++ b/forum/actions/node.py
@@ -19,7 +19,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 +46,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 +140,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
@@ -178,16 +183,16 @@ class WikifyAction(ActionProxy):
     verb = _("wikified")\r
 \r
     def process_action(self):\r
-        self.node.nstate.wiky = self\r
+        self.node.nstate.wiki = self\r
         self.node.last_edited = self\r
         self.node.update_last_activity(self.user, save=True)\r
 \r
     def cancel_action(self):\r
-        self.node.nstate.wiky = None\r
+        self.node.nstate.wiki = None\r
         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