X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/675f602707bc783c6c6db282ac4e14334ef20df7..edcd42cff2f41ebea0f49df0390a17886d32bd38:/forum/models/tag.py

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 5cbaf8a..dd628c8 100644
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -3,38 +3,13 @@ from base import *
 
 from django.utils.translation import ugettext as _
 
-class ActiveTagManager(models.Manager):
-    def get_query_set(self):
-        qs = super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
-
-        CurrentUserHolder = None
-
-        # We try to import the moderation module and if the import is successful we make the filtration
-        try:
-            moderation_import = 'from %s.moderation.startup import CurrentUserHolder' % MODULES_PACKAGE
-            exec moderation_import
-
-            moderation_enabled= True
-        except:
-            moderation_enabled = False
+from forum import modules
 
-        # If the moderation module has been enabled we make the filtration
-        if CurrentUserHolder is not None and moderation_enabled:
-            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)