X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0ba16baba0615dd405486c7d87f943d71518375c..d8df3977ac83876d47c7bc721db0758de2d4ea6b:/forum/actions/meta.py?ds=sidebyside

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index 7c95110..a964ef1 100644
--- a/forum/actions/meta.py
+++ b/forum/actions/meta.py
@@ -97,12 +97,12 @@ class FlagAction(ActionProxy):
         flag.save()
         self.node.reset_flag_count_cache()
 
-        if self.node.flag_count == int(settings.FLAG_COUNT_TO_HIDE_POST):
+        if self.node.flag_count >= int(settings.FLAG_COUNT_TO_HIDE_POST):
             self.repute(self.node.author, -int(settings.REP_LOST_BY_FLAGGED_3_TIMES))
 
-        if self.node.flag_count == int(settings.FLAG_COUNT_TO_DELETE_POST):
+        if self.node.flag_count >= int(settings.FLAG_COUNT_TO_DELETE_POST):
             self.repute(self.node.author, -int(settings.REP_LOST_BY_FLAGGED_5_TIMES))
-            if not self.node.deleted:
+            if not self.node.nis.deleted:
                 DeleteAction(node=self.node, user=self.user, extra="BYFLAGGED").save()
 
     def cancel_action(self):
@@ -133,18 +133,16 @@ class AcceptAnswerAction(ActionProxy):
             self.repute(self.node.author, int(settings.REP_GAIN_BY_ACCEPTED))
 
     def process_action(self):
-        self.node.parent.extra_ref = self.node
-        self.node.parent.save()
         self.node.marked = True
-        self.node.extra_action = self
+        self.node.nstate.accepted = self
         self.node.save()
+        self.node.question.reset_accepted_count_cache()
 
     def cancel_action(self):
-        self.node.parent.extra_ref = None
-        self.node.parent.save()
         self.node.marked = False
-        self.node.extra_action = None
+        self.node.nstate.accepted = None
         self.node.save()
+        self.node.question.reset_accepted_count_cache()
 
     def describe(self, viewer=None):
         answer = self.node
@@ -157,7 +155,7 @@ class AcceptAnswerAction(ActionProxy):
 
         return _("%(user)s accepted %(answerer)s answer on %(asker)s question %(question)s") % {
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),
-            'answerer': self.hyperlink(answer.author.get_profile_url(), self.friendly_username(viewer, answer.author)),
+            'answerer': self.hyperlink(answer.author.get_profile_url(), self.friendly_ownername(viewer, answer.author)),
             'asker': asker,
             'question': self.hyperlink(question.get_absolute_url(), question.title)
         }