Fix OSQA 162, Error running cron/send_email_alerts.

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

diff --git a/forum/models/meta.py b/forum/models/meta.py
index 1498935b0bc4811f7b3f7df407eeac2940e52540..3fd068081e3ef1d7cc65b2744d22dc9f38a52b88 100644 (file)
--- a/forum/models/meta.py
+++ b/forum/models/meta.py
@@ -5,7 +5,7 @@ class Vote(models.Model):
     user = models.ForeignKey(User, related_name="votes")\r
     node = models.ForeignKey(Node, related_name="votes")\r
     value = models.SmallIntegerField()\r
-    action = models.ForeignKey(Action, unique=True, related_name="vote")\r
+    action = models.OneToOneField(Action, related_name="vote")\r
     voted_at = models.DateTimeField(default=datetime.datetime.now)\r
 \r
     class Meta:\r
@@ -17,7 +17,7 @@ class Flag(models.Model):
     user = models.ForeignKey(User, related_name="flags")\r
     node = models.ForeignKey(Node, related_name="flags")\r
     reason = models.CharField(max_length=300)\r
-    action = models.ForeignKey(Action, unique=True, related_name="flag")\r
+    action = models.OneToOneField(Action, related_name="flag")\r
     flagged_at = models.DateTimeField(default=datetime.datetime.now)\r
 \r
     class Meta:\r
@@ -34,7 +34,7 @@ class BadgeManager(models.Manager):
             return super(BadgeManager, self).get(*args, **kwargs)\r
 \r
         from forum.badges.base import BadgesMeta\r
-        badge = BadgesMeta.by_id.get(pk, None)\r
+        badge = BadgesMeta.by_id.get(int(pk), None)\r
         if not badge:\r
             return super(BadgeManager, self).get(*args, **kwargs)\r
         return badge.ondb\r
@@ -64,7 +64,15 @@ class Badge(models.Model):
 \r
     @models.permalink\r
     def get_absolute_url(self):\r
-        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})        \r
+        return ('badge', [], {'id': self.id, 'slug': slugify(self.name)})\r
+\r
+    def save(self, *args, **kwargs):\r
+        if isinstance(self.awarded_count, models.expressions.ExpressionNode):\r
+            super(Badge, self).save(*args, **kwargs)\r
+            self.awarded_count = self.__class__.objects.filter(id=self.id).values_list('awarded_count', flat=True)[0]\r
+        else:\r
+            super(Badge, self).save(*args, **kwargs)\r
+\r
 \r
     class Meta:\r
         app_label = 'forum'\r
@@ -78,7 +86,7 @@ class Award(models.Model):
     awarded_at = models.DateTimeField(default=datetime.datetime.now)\r
 \r
     trigger = models.ForeignKey(Action, related_name="awards", null=True)\r
-    action = models.ForeignKey(Action, related_name="award", unique=True)\r
+    action = models.OneToOneField(Action, related_name="award")\r
 \r
 \r
     class Meta:\r