X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/07fe485fb0a119fb87f8ec948185b5acdd65300e..30beae7541b44060bdd42b55fe525a1113452b55:/forum/actions/meta.py

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index c92d899..1862cb3 100644
--- 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
 from forum.models.action import ActionProxy, DummyActionProxy
 from forum.models import Vote, Flag
-import settings
+from forum import settings
 
 class VoteAction(ActionProxy):
     def update_node_score(self, inc):
@@ -171,15 +171,13 @@ class FavoriteAction(ActionProxy):
 
 class DeleteAction(ActionProxy):
     def process_action(self):
-        self.node.deleted = self
-        self.node.save()
+        self.node.mark_deleted(self)
         
         if self.node.node_type == "answer":
             self.node.question.reset_answer_count_cache()
 
     def cancel_action(self):
-        self.node.deleted = None
-        self.node.save()
+        self.node.mark_deleted(None)
 
         if self.node.node_type == "answer":
             self.node.question.reset_answer_count_cache()
@@ -196,6 +194,9 @@ class DeleteAction(ActionProxy):
         else:
             return _("flagged by multiple users: ") + "; ".join([f.extra for f in FlagAction.objects.filter(node=self.node)])
 
+class UnknownAction(ActionProxy):
+    pass
+
 
 class QuestionViewAction(DummyActionProxy):
     def __init__(self, node, user, ip=None):