OSQA-533, fixed some W3C validation errors: closing <img /> tags, removed some unnece...

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 50eb5aa90a8231aa2d8f0f43f388e852287ba913..dd628c830d2580b7e5e403241dfa065deb556f37 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,31 +1,45 @@
+import datetime
 from base import *
 
 from django.utils.translation import ugettext as _
-import django.dispatch
 
-class ActiveTagManager(UndeletedObjectManager):
-    def get_query_set(self):
-        return super(UndeletedObjectManager, self).get_query_set().exclude(used_count=0)
+from forum import modules
+
+class ActiveTagManager(models.Manager):
+    use_for_related_fields = True
 
+    def get_query_set(self):
+        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
-class Tag(BaseModel, DeletableContent):
+class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
     created_by      = models.ForeignKey(User, related_name='created_tags')
+    created_at      = models.DateTimeField(default=datetime.datetime.now, blank=True, null=True)
     marked_by       = models.ManyToManyField(User, related_name="marked_tags", through="MarkedTag")
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
 
     active = ActiveTagManager()
 
-    class Meta(DeletableContent.Meta):
-        db_table = u'tag'
+    class Meta:
         ordering = ('-used_count', 'name')
+        app_label = 'forum'
 
     def __unicode__(self):
-        return self.name
+        return u'%s' % self.name
+
+    def add_to_usage_count(self, value):
+        if self.used_count + value < 0:
+            self.used_count = 0
+        else:
+            self.used_count = models.F('used_count') + value
+
+    @models.permalink
+    def get_absolute_url(self):
+        return ('tag_questions', (), {'tag': self.name})
 
 class MarkedTag(models.Model):
-    TAG_MARK_REASONS = (('good',_('interesting')),('bad',_('ignored')))
+    TAG_MARK_REASONS = (('good', _('interesting')), ('bad', _('ignored')))
     tag = models.ForeignKey(Tag, related_name='user_selections')
     user = models.ForeignKey(User, related_name='tag_selections')
     reason = models.CharField(max_length=16, choices=TAG_MARK_REASONS)