Fixes OSQA 275, Password changing is not reliable.

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 50eb5aa90a8231aa2d8f0f43f388e852287ba913..898c3e178d75d3b7d37664bccba046872ef776b5 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -3,12 +3,12 @@ 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(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')
     marked_by       = models.ManyToManyField(User, related_name="marked_tags", through="MarkedTag")
@@ -17,9 +17,10 @@ class Tag(BaseModel, DeletableContent):
 
     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