#OSQA-388, creating a separate action for the award points for an answer functionality.

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

diff --git a/forum/models/node.py b/forum/models/node.py
index 74490829b46245097af166dca69c0632e5ec812a..553b6c26188f9f36b173dc4b5cfb6a8db5e59407 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -8,7 +8,6 @@ from django.utils.safestring import mark_safe
 from django.utils.html import strip_tags
 from forum.utils.html import sanitize_html
 from forum.settings import SUMMARY_LENGTH
-from forum.modules import MODULES_PACKAGE
 from utils import PickledObjectField
 
 class NodeContent(models.Model):
@@ -143,29 +142,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 the node is an answer, question or comment we filter the Node model by type
         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
 
     def get_for_types(self, types, *args, **kwargs):