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 2a3609a9636d6f4cd6fdbe2f7461620a5162ef48..dd628c830d2580b7e5e403241dfa065deb556f37 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,36 +1,15 @@
 import datetime
 from base import *
 
-from forum.modules import MODULES_PACKAGE
-
 from django.utils.translation import ugettext as _
-import django.dispatch
-
-class ActiveTagManager(models.Manager):
-    def get_query_set(self):
-        qs = super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
-
-        CurrentUserHolder = None
 
-        moderation_import = 'from %s.moderation.startup import CurrentUserHolder' % MODULES_PACKAGE
-        exec moderation_import
+from forum import modules
 
-        if CurrentUserHolder is not None:
-            user = CurrentUserHolder.user
-
-            try:
-                filter_content = not user.is_staff and not user.is_superuser
-            except:
-                filter_content = True
-
-            if filter_content:
-                moderation_import = 'from %s.moderation.hooks import get_tag_ids' % MODULES_PACKAGE
-                exec moderation_import
-                qs = qs.exclude(id__in=get_tag_ids('deleted')).exclude(id__in=get_tag_ids('rejected')).exclude(
-                    id__in=get_tag_ids('in_moderation')
-                )
+class ActiveTagManager(models.Manager):
+    use_for_related_fields = True
 
-        return qs
+    def get_query_set(self):
+        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
@@ -41,7 +20,6 @@ class Tag(BaseModel):
     used_count = models.PositiveIntegerField(default=0)
 
     active = ActiveTagManager()
-    objects = ActiveTagManager()
 
     class Meta:
         ordering = ('-used_count', 'name')