Support of including blog in the website search

blog/admin.py

@@ -11,8 +11,15 @@
 
 @admin.register(Entry)
 class EntryAdmin(admin.ModelAdmin):
-    list_display = ("headline", "pub_date", "is_active", "is_published", "author")
-    list_filter = ("is_active",)
+    list_display = (
+        "headline",
+        "pub_date",
+        "is_active",
+        "is_published",
+        "is_searchable",
+        "author",
+    )
+    list_filter = ("is_active", "is_searchable")
     exclude = ("summary_html", "body_html")
     prepopulated_fields = {"slug": ("headline",)}
     raw_id_fields = ["social_media_card"]

blog/migrations/0006_entry_is_searchable.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2 on 2025-07-24 07:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0005_entry_social_media_card'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='entry',
+            name='is_searchable',
+            field=models.BooleanField(help_text='Tick to make this entry allow this entry to appear in the Django documentation search.', null=True),
+        ),
+    ]

blog/migrations/0007_set_is_searchable.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2 on 2025-07-24 07:22
+
+from django.db import migrations
+
+
+def set_is_searchable(apps, schema_editor):
+    Entry = apps.get_model("blog", "Entry")
+    # If this is large, this should be split into batched updates
+    Entry.objects.filter(is_searchable__isnull=True).update(is_searchable=False)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0006_entry_is_searchable'),
+    ]
+
+    operations = [
+        migrations.RunPython(set_is_searchable, reverse_code=migrations.RunPython.noop, elidable=True),
+    ]

blog/migrations/0008_alter_entry_is_searchable.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2 on 2025-07-24 07:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('blog', '0007_set_is_searchable'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='entry',
+            name='is_searchable',
+            field=models.BooleanField(default=False, help_text='Tick to make this entry allow this entry to appear in the Django documentation search.'),
+        ),
+    ]

blog/models.py

@@ -31,12 +31,17 @@ def _md_slugify(value, separator):
 
 
 class EntryQuerySet(models.QuerySet):
-    def published(self):
-        return self.active().filter(pub_date__lte=timezone.now())
+    def published(self, pub_date=None):
+        if pub_date is None:
+            pub_date = timezone.now()
+        return self.active().filter(pub_date__lte=pub_date)
 
     def active(self):
         return self.filter(is_active=True)
 
+    def searchable(self):
+        return self.filter(is_searchable=True)
+
 
 class ContentFormat(models.TextChoices):
     REST = "reST", "reStructuredText"
@@ -126,6 +131,13 @@ class Entry(models.Model):
         ),
         default=False,
     )
+    is_searchable = models.BooleanField(
+        default=False,
+        help_text=_(
+            "Tick to make this entry allow this entry to appear in the "
+            "Django documentation search."
+        ),
+    )
     pub_date = models.DateTimeField(
         verbose_name=_("Publication date"),
         help_text=_(
@@ -168,7 +180,7 @@ def get_absolute_url(self):
             "day": self.pub_date.strftime("%d").lower(),
             "slug": self.slug,
         }
-        return reverse("weblog:entry", kwargs=kwargs)
+        return reverse("weblog:entry", kwargs=kwargs, host="www")
 
     def is_published(self):
         """

blog/tests.py

@@ -64,6 +64,31 @@ def test_manager_published(self):
             ["past active"],
             transform=lambda entry: entry.headline,
         )
+        self.assertQuerySetEqual(
+            Entry.objects.published(self.tomorrow),
+            ["future active", "past active"],
+            transform=lambda entry: entry.headline,
+        )
+
+    def test_manager_searchable(self):
+        """
+        Make sure that the Entry manager's `searchable` method works
+        """
+        Entry.objects.create(
+            pub_date=self.yesterday,
+            is_searchable=False,
+            headline="not searchable",
+            slug="a",
+        )
+        Entry.objects.create(
+            pub_date=self.yesterday, is_searchable=True, headline="searchable", slug="b"
+        )
+
+        self.assertQuerySetEqual(
+            Entry.objects.searchable(),
+            ["searchable"],
+            transform=lambda entry: entry.headline,
+        )
 
     def test_docutils_safe(self):
         """

docs/migrations/0007_documentrelease_support_end.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2 on 2025-07-23 16:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('docs', '0006_alter_document_metadata_noop'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='documentrelease',
+            name='support_end',
+            field=models.DateField(blank=True, help_text='The end of support for this release of Django.', null=True),
+        ),
+    ]

docs/models.py

@@ -18,10 +18,13 @@
 from django.db import models, transaction
 from django.db.models import Q
 from django.db.models.fields.json import KeyTextTransform
+from django.test import RequestFactory
+from django.urls import resolve, reverse as reverse_path
 from django.utils.functional import cached_property
 from django.utils.html import strip_tags
 from django_hosts.resolvers import reverse
 
+from blog.models import Entry
 from releases.models import Release
 
 from . import utils
@@ -31,6 +34,7 @@
     START_SEL,
     STOP_SEL,
     TSEARCH_CONFIG_LANGUAGES,
+    DocumentationCategory,
 )
 
 
@@ -95,6 +99,11 @@ class DocumentRelease(models.Model):
         on_delete=models.CASCADE,
     )
     is_default = models.BooleanField(default=False)
+    support_end = models.DateField(
+        null=True,
+        blank=True,
+        help_text="The end of support for this release of Django.",
+    )
 
     objects = DocumentReleaseQuerySet.as_manager()
 
@@ -212,6 +221,83 @@ def sync_to_db(self, decoded_documents):
             )
             document.save(update_fields=("metadata",))
 
+        self._sync_blog_to_db()
+        self._sync_views_to_db()
+
+    def _sync_blog_to_db(self):
+        """
+        Sync the blog entries into search based on the release documents
+        support end date.
+        """
+        if self.lang == "en" and self.support_end:
+            for entry in Entry.objects.published(self.support_end).searchable():
+                Document.objects.create(
+                    release=self,
+                    path=entry.get_absolute_url(),
+                    title=entry.headline,
+                    metadata={
+                        "body": entry.body_html,
+                        "breadcrumbs": [
+                            {
+                                "path": DocumentationCategory.WEBSITE.value,
+                                "title": "News",
+                            },
+                        ],
+                        "parents": DocumentationCategory.WEBSITE.value,
+                        "slug": entry.slug,
+                        "title": entry.headline,
+                        "toc": "",
+                    },
+                    config=TSEARCH_CONFIG_LANGUAGES.get(
+                        self.lang[:2], DEFAULT_TEXT_SEARCH_CONFIG
+                    ),
+                )
+
+    def _sync_views_to_db(self):
+        """
+        Sync the blog entries into search based on the release documents
+        support end date.
+        """
+        if self.lang == "en":
+            # The request needs to come through as a valid one, it's best if it
+            # matches the exact host we're looking for.
+            www_hosts = [
+                host for host in settings.ALLOWED_HOSTS if host.startswith("www.")
+            ]
+            if not www_hosts or not (www_host := www_hosts[0]):
+                return
+            synced_views = [
+                # Page title, url name, url kwargs
+                ("Django's Ecosystem", "community-ecosystem", {}),
+            ]
+            for title, url_name, kwargs in synced_views:
+                absolute_url = reverse(url_name, kwargs=kwargs, host="www")
+                path = reverse_path(url_name, kwargs=kwargs)
+                request = RequestFactory().get(path, HTTP_HOST=www_host)
+                body = resolve(path).func(request).render().text
+                # Need to parse the body element.
+                Document.objects.create(
+                    release=self,
+                    path=absolute_url,
+                    title=title,
+                    metadata={
+                        "body": body,
+                        "breadcrumbs": [
+                            {
+                                "path": DocumentationCategory.WEBSITE.value,
+                                "title": "Website",
+                            },
+                        ],
+                        "parents": DocumentationCategory.WEBSITE.value,
+                        "slug": url_name,
+                        "title": title,
+                        "toc": "",
+                    },
+                    config=TSEARCH_CONFIG_LANGUAGES.get(
+                        self.lang[:2], DEFAULT_TEXT_SEARCH_CONFIG
+                    ),
+                )
+
 
 def _clean_document_path(path):
     # We have to be a bit careful to reverse-engineer the correct
@@ -224,7 +310,9 @@ def _clean_document_path(path):
 
 
 def document_url(doc):
-    if doc.path:
+    if doc.metadata.get("parents") == DocumentationCategory.WEBSITE.value:
+        return doc.path
+    elif doc.path:
         kwargs = {
             "lang": doc.release.lang,
             "version": doc.release.version,

docs/search.py

@@ -65,6 +65,7 @@ class DocumentationCategory(TextChoices):
     TOPICS = "topics", _("Using Django")
     HOWTO = "howto", _("How-to guides")
     RELEASE_NOTES = "releases", _("Release notes")
+    WEBSITE = "weblog", _("Django Website")
 
     @classmethod
     def parse(cls, value, default=None):

docs/templates/docs/search_results.html

@@ -43,11 +43,11 @@ <h2>{% translate "No search query given" %}</h2>
         {% for result in page.object_list %}
           <dt>
             <h2 class="result-title">
-              <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=result.path host 'docs' %}{% if not start_sel in result.headline %}{{ result.highlight|fragment }}{% endif %}">{{ result.headline|safe }}</a>
+              <a href="{{ result.get_absolute_url }}{% if not start_sel in result.headline %}{{ result.highlight|fragment }}{% endif %}">{{ result.headline|safe }}</a>
             </h2>
             <span class="meta breadcrumbs">
               {% for breadcrumb in result.breadcrumbs %}
-                <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=breadcrumb.path host 'docs' %}">{{ breadcrumb.title }}</a>{% if not forloop.last %} <span class="arrow">»</span>{% endif %}
+                <a href="{{ result.get_absolute_url }}">{{ breadcrumb.title }}</a>{% if not forloop.last %} <span class="arrow">»</span>{% endif %}
               {% endfor %}
             </span>
           </dt>
@@ -60,7 +60,7 @@ <h2 class="result-title">
               <ul class="code-links">
                 {% for name, value in result_code_links.items %}
                   <li>
-                    <a href="{% url 'document-detail' lang=result.release.lang version=result.release.version url=result.path host 'docs' %}#{{ value.full_path }}">
+                    <a href="{{ result.get_absolute_url }}#{{ value.full_path }}">
                       <div>
                         <code>{{ name }}</code>
                         {% if value.module_path %}<div class="meta">{{ value.module_path }}</div>{% endif %}