X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/745f67c37acdb9574c5297004adde2b9a7da5fdb..4f69eff9f09ed7ad63c4e5ade45c269eb2e7bcf9:/forum/models/tag.py diff --git a/forum/models/tag.py b/forum/models/tag.py index 2a3609a..d189a1c 100644 --- 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)