From 2d4afe606289da4fdd3354c2b1a0562d62de2f41 Mon Sep 17 00:00:00 2001 From: sks444 <krishnasingh.ss30@gmail.com> Date: Mon, 28 Sep 2020 09:36:46 +0530 Subject: [PATCH] Hide private partners page and its partner --- hypha/public/partner/models.py | 6 ++++++ hypha/public/partner/views.py | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/hypha/public/partner/models.py b/hypha/public/partner/models.py index 39651874d..2b1bee9a8 100644 --- a/hypha/public/partner/models.py +++ b/hypha/public/partner/models.py @@ -3,6 +3,7 @@ import datetime from django import forms from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models +from django.http import Http404 from django.shortcuts import redirect from pagedown.widgets import PagedownWidget from wagtail.admin.edit_handlers import FieldPanel @@ -97,6 +98,11 @@ class PartnerPage(BasePage): category_questions[category.name] = [category.value] return category_questions + def serve(self, request, *args, **kwargs): + if not self.public: + raise Http404 + return super(PartnerPage, self).serve(request, *args, **kwargs) + def current_year(): return datetime.date.today().year diff --git a/hypha/public/partner/views.py b/hypha/public/partner/views.py index abedfcaba..f0fedec92 100644 --- a/hypha/public/partner/views.py +++ b/hypha/public/partner/views.py @@ -1,7 +1,7 @@ from django_filters.views import FilterView +from django_tables2.export.views import ExportMixin from django_tables2.paginators import LazyPaginator from django_tables2.views import SingleTableMixin -from django_tables2.export.views import ExportMixin from .models import Investment from .tables import InvestmentFilterAndSearch, InvestmentTable @@ -30,3 +30,6 @@ class InvestmentTableView(ExportMixin, SingleTableMixin, FilterView): filter_action=self.filter_action, **kwargs, ) + + def get_queryset(self): + return Investment.objects.filter(partner__public=True) -- GitLab