Applies some of the Justin Grant's patches.

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 13445977ded256e0dc004d22e2a15fae787a23c8..0bff00473d1268e698e191745938d49e4dabfac2 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -5,7 +5,7 @@ import django.dispatch
 
 class ActiveTagManager(models.Manager):
     def get_query_set(self):
-        return super(ActiveTagManager, self).get_query_set().exclude(deleted=False, used_count=0)
+        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
 
 class Tag(BaseModel):
@@ -15,30 +15,8 @@ class Tag(BaseModel):
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
 
-    deleted     = models.BooleanField(default=False)
-    deleted_at  = models.DateTimeField(null=True, blank=True)
-    deleted_by  = models.ForeignKey(User, null=True, blank=True, related_name='deleted_%(class)ss')
-
     active = ActiveTagManager()
 
-    def mark_deleted(self, user):
-        if not self.deleted:
-            self.deleted = True
-            self.deleted_at = datetime.datetime.now()
-            self.deleted_by = user
-            self.save()
-            return True
-        else:
-            return False
-
-    def unmark_deleted(self):
-        if self.deleted:
-            self.deleted = False
-            self.save()
-            return True
-        else:
-            return False
-
     class Meta:
         ordering = ('-used_count', 'name')
         app_label = 'forum'
@@ -46,8 +24,18 @@ class Tag(BaseModel):
     def __unicode__(self):
         return 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)