Fix OSQA 269, User messages in new admin don't seem to link properly.

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

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index c92d8992501abbde75bb58ce95fdf336e99987db..1862cb3113c04c2910e7bb0992958153ea5c8459 100644 (file)
--- a/forum/actions/meta.py
+++ b/forum/actions/meta.py
@@ -2,7 +2,7 @@ from django.utils.translation import ugettext as _
 from django.db.models import F\r
 from forum.models.action import ActionProxy, DummyActionProxy\r
 from forum.models import Vote, Flag\r
-import settings\r
+from forum import settings\r
 \r
 class VoteAction(ActionProxy):\r
     def update_node_score(self, inc):\r
@@ -171,15 +171,13 @@ class FavoriteAction(ActionProxy):
 \r
 class DeleteAction(ActionProxy):\r
     def process_action(self):\r
-        self.node.deleted = self\r
-        self.node.save()\r
+        self.node.mark_deleted(self)\r
         \r
         if self.node.node_type == "answer":\r
             self.node.question.reset_answer_count_cache()\r
 \r
     def cancel_action(self):\r
-        self.node.deleted = None\r
-        self.node.save()\r
+        self.node.mark_deleted(None)\r
 \r
         if self.node.node_type == "answer":\r
             self.node.question.reset_answer_count_cache()\r
@@ -196,6 +194,9 @@ class DeleteAction(ActionProxy):
         else:\r
             return _("flagged by multiple users: ") + "; ".join([f.extra for f in FlagAction.objects.filter(node=self.node)])\r
 \r
+class UnknownAction(ActionProxy):\r
+    pass\r
+\r
 \r
 class QuestionViewAction(DummyActionProxy):\r
     def __init__(self, node, user, ip=None):\r