Removing the code that Hernani has removed in Revision 828 again. Somehow after the...

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

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]