Makes hitting a question url using an id that is not a question raise a 404.

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

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index a45fe588a4089c3895da9b4c39ee5e8ea50edcba..ccdaa75f390396d09b2687b95e1277f3b450e9b9 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
@@ -15,7 +15,7 @@ class VoteAction(ActionProxy):
         vote.save()\r
 \r
     def cancel_action(self):\r
-        vote = self.vote.all()[0]\r
+        vote = self.vote\r
         self.update_node_score(-vote.value)\r
         vote.delete()\r
 \r
@@ -27,6 +27,14 @@ class VoteAction(ActionProxy):
         except:\r
             return None\r
 \r
+    @classmethod\r
+    def get_action_for(cls, user, node):\r
+        try:\r
+            vote = Vote.objects.get(user=user, node=node)\r
+            return vote.action\r
+        except:\r
+            return None\r
+\r
     def describe_vote(self, vote_desc, viewer=None):\r
         return _("%(user)s %(vote_desc)s %(post_desc)s") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
@@ -94,11 +102,11 @@ 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
-        self.flag.all()[0].delete()\r
+        self.flag.delete()\r
         self.node.reset_flag_count_cache()\r
 \r
     @classmethod\r
@@ -128,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
@@ -149,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
@@ -171,23 +179,21 @@ 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
 \r
     def describe(self, viewer=None):\r
-        return _("%(user)s deleted %(post_desc)s: %(reason)s") % {\r
+        return _("%(user)s deleted %(post_desc)s") % {\r
             'user': self.hyperlink(self.user.get_profile_url(), self.friendly_username(viewer, self.user)),\r
-            'post_desc': self.describe_node(viewer, self.node), 'reason': self.reason(),\r
+            'post_desc': self.describe_node(viewer, self.node)\r
         }\r
 \r
     def reason(self):\r
@@ -196,12 +202,16 @@ 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, question, user):\r
+    def __init__(self, node, user, ip=None):\r
         self.viewuser = user\r
-        self.question = question\r
+        self.node = node\r
+        super(QuestionViewAction, self).__init__(ip)\r
 \r
     def process_action(self):\r
-        self.question.extra_count = F('extra_count') + 1\r
-        self.question.save()\r
+        self.node.extra_count = F('extra_count') + 1\r
+        self.node.save()\r