don't humanize the min and max # of tags. It causes weirdness with translations...

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

diff --git a/forum/actions/meta.py b/forum/actions/meta.py
index a45fe588a4089c3895da9b4c39ee5e8ea50edcba..b16f4f994124cb930051d0b005a1cc5ded8cc9e4 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
 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
 \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.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
         self.update_node_score(-vote.value)\r
         vote.delete()\r
 \r


@@ -98,7 +98,7 @@ class FlagAction(ActionProxy):
                 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

-        self.flag.all()[0].delete()\r
+        self.flag.delete()\r

         self.node.reset_flag_count_cache()\r
 \r
     @classmethod\r
         self.node.reset_flag_count_cache()\r
 \r
     @classmethod\r


@@ -196,12 +196,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
         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
 \r
 class QuestionViewAction(DummyActionProxy):\r

-    def __init__(self, question, user):\r
+    def __init__(self, node, user, ip=None):\r

         self.viewuser = user\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
 \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