X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/08948f69c835e27c0f90dea93d71901a5a62b0f5..745f67c37acdb9574c5297004adde2b9a7da5fdb:/forum/models/tag.py

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 44e0a74..2a3609a 100644
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,13 +1,36 @@
 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):
-        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
+        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
+
+        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')
+                )
 
+        return qs
 
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
@@ -18,6 +41,7 @@ class Tag(BaseModel):
     used_count = models.PositiveIntegerField(default=0)
 
     active = ActiveTagManager()
+    objects = ActiveTagManager()
 
     class Meta:
         ordering = ('-used_count', 'name')