reintegrate merge jambazov -> trunk

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

diff --git a/forum/models/node.py b/forum/models/node.py
index d4d0442e373996148e3a07edf756a3c7efea1e17..74490829b46245097af166dca69c0632e5ec812a 100644 (file)
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -143,12 +143,30 @@ 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:
-            return qs.filter(node_type=self.model.get_type())
-        else:
-            return qs
+            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):
         kwargs['node_type__in'] = [t.get_type() for t in types]

diff --git a/forum/models/tag.py b/forum/models/tag.py
index d189a1ce83bfb20851659e7963a832dfcb5127d7..79ec7ddafd1fcdfedb916581d654032eb12616ea 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -8,7 +8,28 @@ 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)

diff --git a/settings.py b/settings.py
index 6a9112af5397fadb1a8fb768566871cbaf178129..0db3f3b9ba2759b333d9c262fcb1d88c4678a99f 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -72,7 +72,6 @@ if FORCE_SCRIPT_NAME.endswith('/'):
     FORCE_SCRIPT_NAME = FORCE_SCRIPT_NAME[:-1]
 
 from forum import modules
-
 modules.init_modules_engine(SITE_SRC_ROOT, DISABLED_MODULES)
 
 [MIDDLEWARE_CLASSES.extend(