Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not display products without docs #6164

Merged
merged 1 commit into from
Aug 5, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions kitsune/products/views.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import json
from datetime import datetime, timedelta

from django.db.models import Q
from django.db.models import Exists, OuterRef, Q
from django.http import Http404, HttpResponse
from django.shortcuts import get_object_or_404, redirect, render
from product_details import product_details
Expand All @@ -10,7 +10,7 @@
from kitsune.questions import config as aaq_config
from kitsune.wiki.decorators import check_simple_wiki_locale
from kitsune.wiki.facets import documents_for, topics_for
from kitsune.wiki.models import Revision
from kitsune.wiki.models import Document, Revision
from kitsune.wiki.utils import get_featured_articles


Expand Down Expand Up @@ -131,7 +131,9 @@ def document_listing(request, topic_slug, product_slug=None, subtopic_slug=None)
topic = Topic.active.filter(**topic_kw).first()

topic_list = Topic.active.filter(in_nav=True)
relevant_products = Product.active.filter(m2m_topics=topic)
relevant_products = Product.active.filter(m2m_topics=topic).filter(
Exists(Document.objects.visible(topics=topic, products=OuterRef("pk")))
)
else:
topic = get_object_or_404(Topic, slug=topic_slug, product=product, parent__isnull=True)
product_topics = topics_for(request.user, product=product, parent=None)
Expand Down