Some fixes in custom pages logic.

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

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index 7c951101f8954885e1ed811b3561b65d47142d87..ccdaa75f390396d09b2687b95e1277f3b450e9b9 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
-            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
@@ -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.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.extra_action = None\r
+        self.node.nstate.accepted = None\r
         self.node.save()\r
 \r
     def describe(self, viewer=None):\r
@@ -157,7 +157,7 @@ class AcceptAnswerAction(ActionProxy):
 \r
         return _("%(user)s accepted %(answerer)s answer on %(asker)s question %(question)s") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
-            'answerer': self.hyperlink(answer.author.get_profile_url(), self.friendly_username(viewer, answer.author)),\r
+            'answerer': self.hyperlink(answer.author.get_profile_url(), self.friendly_ownername(viewer, answer.author)),\r
             'asker': asker,\r
             'question': self.hyperlink(question.get_absolute_url(), question.title)\r
         }\r