Added a direct option to mark a post as community wiki, still needs some sort of...

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

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index 7c951101f8954885e1ed811b3561b65d47142d87..adf51ca933c63fdf26d2b4a89aa8d4acb4f7c883 100644 (file)
--- a/forum/actions/meta.py
+++ b/forum/actions/meta.py
@@ -102,7 +102,7 @@ class FlagAction(ActionProxy):
 \r
         if self.node.flag_count == int(settings.FLAG_COUNT_TO_DELETE_POST):\r
             self.repute(self.node.author, -int(settings.REP_LOST_BY_FLAGGED_5_TIMES))\r
 \r
         if self.node.flag_count == int(settings.FLAG_COUNT_TO_DELETE_POST):\r
             self.repute(self.node.author, -int(settings.REP_LOST_BY_FLAGGED_5_TIMES))\r

-            if not self.node.deleted:\r
+            if not self.node.nis.deleted:\r

                 DeleteAction(node=self.node, user=self.user, extra="BYFLAGGED").save()\r
 \r
     def cancel_action(self):\r
                 DeleteAction(node=self.node, user=self.user, extra="BYFLAGGED").save()\r
 \r
     def cancel_action(self):\r


@@ -136,14 +136,14 @@ class AcceptAnswerAction(ActionProxy):
         self.node.parent.extra_ref = self.node\r
         self.node.parent.save()\r
         self.node.marked = True\r
         self.node.parent.extra_ref = self.node\r
         self.node.parent.save()\r
         self.node.marked = True\r

-        self.node.extra_action = self\r
+        self.node.nstate.accepted = self\r

         self.node.save()\r
 \r
     def cancel_action(self):\r
         self.node.parent.extra_ref = None\r
         self.node.parent.save()\r
         self.node.marked = False\r
         self.node.save()\r
 \r
     def cancel_action(self):\r
         self.node.parent.extra_ref = None\r
         self.node.parent.save()\r
         self.node.marked = False\r

-        self.node.extra_action = None\r
+        self.node.nstate.accepted = None\r

         self.node.save()\r
 \r
     def describe(self, viewer=None):\r
         self.node.save()\r
 \r
     def describe(self, viewer=None):\r