X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/745f67c37acdb9574c5297004adde2b9a7da5fdb..4f69eff9f09ed7ad63c4e5ade45c269eb2e7bcf9:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 7449082..d4d0442 100644 --- 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]