From 995c753a4b44b617906983b418f6032ddee84a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 23 Mar 2016 13:47:07 +0100 Subject: [PATCH] Issue #225 (taiga-payments): Remove blocked project from discover calls --- taiga/projects/filters.py | 3 ++- taiga/projects/models.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/taiga/projects/filters.py b/taiga/projects/filters.py index b4106a3c..f01ed179 100644 --- a/taiga/projects/filters.py +++ b/taiga/projects/filters.py @@ -37,7 +37,8 @@ class DiscoverModeFilterBackend(FilterBackend): if discover_mode: # discover_mode enabled - qs = qs.filter(anon_permissions__contains=["view_project"]) + qs = qs.filter(anon_permissions__contains=["view_project"], + blocked_code__isnull=True) return super().filter_queryset(request, qs.distinct(), view) diff --git a/taiga/projects/models.py b/taiga/projects/models.py index 5cbf5554..59d16f9a 100644 --- a/taiga/projects/models.py +++ b/taiga/projects/models.py @@ -220,6 +220,10 @@ class Project(ProjectDefaults, TaggedMixin, models.Model): transfer_token = models.CharField(max_length=255, null=True, blank=True, default=None, verbose_name=_("project transfer token")) + blocked_code = models.CharField(null=True, blank=True, max_length=255, + choices=choices.BLOCKING_CODES + settings.EXTRA_BLOCKING_CODES, default=None, + verbose_name=_("blocked code")) + #Totals: totals_updated_datetime = models.DateTimeField(null=False, blank=False, auto_now_add=True, verbose_name=_("updated date time"), db_index=True) @@ -248,10 +252,6 @@ class Project(ProjectDefaults, TaggedMixin, models.Model): total_activity_last_year = models.PositiveIntegerField(null=False, blank=False, default=0, verbose_name=_("activity last year"), db_index=True) - blocked_code = models.CharField(null=True, blank=True, max_length=255, - choices=choices.BLOCKING_CODES + settings.EXTRA_BLOCKING_CODES, default=None, - verbose_name=_("blocked code")) - _importing = None class Meta: