Removes some test code.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@828 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/node.py b/forum/models/node.py
index 74490829b46245097af166dca69c0632e5ec812a..d4d0442e373996148e3a07edf756a3c7efea1e17 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -143,30 +143,12 @@ class NodeManager(CachedManager):
     use_for_related_fields = True
 
     def get_query_set(self):
-        CurrentUserHolder = None
-
-        moderation_import = 'from %s.moderation.startup import CurrentUserHolder' % MODULES_PACKAGE
-        exec moderation_import
-
         qs = NodeQuerySet(self.model)
 
         if self.model is not Node:
-            qs = qs.filter(node_type=self.model.get_type())
-
-        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:
-                qs = qs.exclude(state_string__contains="(in_moderation)").exclude(state_string__contains="(deleted)").exclude(
-                    state_string__contains="(rejected)"
-                )
-
-        return qs
+            return qs.filter(node_type=self.model.get_type())
+        else:
+            return qs
 
     def get_for_types(self, types, *args, **kwargs):
         kwargs['node_type__in'] = [t.get_type() for t in types]

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 2a3609a9636d6f4cd6fdbe2f7461620a5162ef48..d189a1ce83bfb20851659e7963a832dfcb5127d7 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -8,29 +8,7 @@ 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
-
-        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
+        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)