Some improvements in cache.

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 16f1c6cdc80a1699215d669f7984fd7dada35d9a..13445977ded256e0dc004d22e2a15fae787a23c8 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -3,22 +3,45 @@ from base import *
 from django.utils.translation import ugettext as _
 import django.dispatch
 
-class ActiveTagManager(UndeletedObjectManager):
+class ActiveTagManager(models.Manager):
     def get_query_set(self):
-        return super(UndeletedObjectManager, self).get_query_set().exclude(used_count=0)
+        return super(ActiveTagManager, self).get_query_set().exclude(deleted=False, used_count=0)
 
 
-class Tag(BaseModel, DeletableContent):
+class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
     created_by      = models.ForeignKey(User, related_name='created_tags')
     marked_by       = models.ManyToManyField(User, related_name="marked_tags", through="MarkedTag")
     # 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()
 
-    class Meta(DeletableContent.Meta):
+    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'
 
     def __unicode__(self):
         return self.name