From 53ad5fb9fc00d2b17cc3e28d0e4ae853ca61c2e8 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 27 Jan 2016 12:29:55 +0100 Subject: [PATCH] Excluding blocked projects from sitemap --- taiga/front/sitemaps/issues.py | 3 +++ taiga/front/sitemaps/milestones.py | 3 +++ taiga/front/sitemaps/projects.py | 3 +++ taiga/front/sitemaps/tasks.py | 3 +++ taiga/front/sitemaps/userstories.py | 3 +++ taiga/front/sitemaps/wiki.py | 3 +++ 6 files changed, 18 insertions(+) diff --git a/taiga/front/sitemaps/issues.py b/taiga/front/sitemaps/issues.py index 38d70d70..bf5694e0 100644 --- a/taiga/front/sitemaps/issues.py +++ b/taiga/front/sitemaps/issues.py @@ -32,6 +32,9 @@ class IssuesSitemap(Sitemap): Q(project__is_private=True, project__anon_permissions__contains=["view_issues"])) + # Exclude blocked projects + queryset = queryset.filter(project__blocked_code__isnull=True) + # Project data is needed queryset = queryset.select_related("project") diff --git a/taiga/front/sitemaps/milestones.py b/taiga/front/sitemaps/milestones.py index 73a1c064..274cbaf8 100644 --- a/taiga/front/sitemaps/milestones.py +++ b/taiga/front/sitemaps/milestones.py @@ -34,6 +34,9 @@ class MilestonesSitemap(Sitemap): "view_us", "view_tasks"])) + # Exclude blocked projects + queryset = queryset.filter(project__blocked_code__isnull=True) + # Project data is needed queryset = queryset.select_related("project") diff --git a/taiga/front/sitemaps/projects.py b/taiga/front/sitemaps/projects.py index 80cd483b..cdfc8cc2 100644 --- a/taiga/front/sitemaps/projects.py +++ b/taiga/front/sitemaps/projects.py @@ -32,6 +32,9 @@ class ProjectsSitemap(Sitemap): Q(is_private=True, anon_permissions__contains=["view_project"])) + # Exclude blocked projects + queryset = queryset.filter(blocked_code__isnull=True) + return queryset def location(self, obj): diff --git a/taiga/front/sitemaps/tasks.py b/taiga/front/sitemaps/tasks.py index a1b2570e..eaa599ff 100644 --- a/taiga/front/sitemaps/tasks.py +++ b/taiga/front/sitemaps/tasks.py @@ -32,6 +32,9 @@ class TasksSitemap(Sitemap): Q(project__is_private=True, project__anon_permissions__contains=["view_tasks"])) + # Exclude blocked projects + queryset = queryset.filter(project__blocked_code__isnull=True) + # Project data is needed queryset = queryset.select_related("project") diff --git a/taiga/front/sitemaps/userstories.py b/taiga/front/sitemaps/userstories.py index 0d59c323..9d66773c 100644 --- a/taiga/front/sitemaps/userstories.py +++ b/taiga/front/sitemaps/userstories.py @@ -32,6 +32,9 @@ class UserStoriesSitemap(Sitemap): Q(project__is_private=True, project__anon_permissions__contains=["view_us"])) + # Exclude blocked projects + queryset = queryset.filter(project__blocked_code__isnull=True) + # Project data is needed queryset = queryset.select_related("project") diff --git a/taiga/front/sitemaps/wiki.py b/taiga/front/sitemaps/wiki.py index 7021d393..85e03ba0 100644 --- a/taiga/front/sitemaps/wiki.py +++ b/taiga/front/sitemaps/wiki.py @@ -32,6 +32,9 @@ class WikiPagesSitemap(Sitemap): Q(project__is_private=True, project__anon_permissions__contains=["view_wiki_pages"])) + # Exclude blocked projects + queryset = queryset.filter(project__blocked_code__isnull=True) + # Exclude wiki pages from projects without wiki section enabled queryset = queryset.exclude(project__is_wiki_activated=False)