Merge branch 'develop' into pre-commit-ci-update-config

Author: protoroto

.github/workflows/lint.yml

@@ -35,7 +35,8 @@ jobs:
           ${{ runner.os }}-lint-${{ matrix.toxenv }}-
     - name: Install dependencies
       run: |
-        sudo apt-get install libcairo2-dev
+        sudo apt update
+        sudo apt install libcairo2-dev
         python -m pip install --upgrade pip setuptools tox>4
     - name: Test with tox
       if: ${{ matrix.toxenv != 'towncrier' || (!contains(github.event.head_commit.message, '[pre-commit.ci]') && !contains(github.event.pull_request.body, 'pre-commit.ci start')) }}

.github/workflows/test.yml

@@ -40,7 +40,8 @@ jobs:
           ${{ runner.os }}-tox-${{ format('{{py{0}-django{1}-cms{2}}}', matrix.python-version, matrix.django, matrix.cms) }}-
     - name: Install dependencies
       run: |
-        sudo apt-get install gettext libcairo2-dev
+        sudo apt update
+        sudo apt install gettext libcairo2-dev
         python -m pip install --upgrade pip setuptools tox>4
     - name: Test with tox
       env:

changes/793.bugfix

@@ -0,0 +1 @@
+Catch Resolver404 when blog menu is rendered in 404 pages

changes/850.feature

@@ -0,0 +1 @@
+Make BlogFeaturedPostsPlugin show unpublished posts if in edit mode

djangocms_blog/cms_menus.py

@@ -4,7 +4,7 @@
 from cms.menu_bases import CMSAttachMenu
 from django.contrib.sites.shortcuts import get_current_site
 from django.db.models.signals import post_delete, post_save
-from django.urls import resolve
+from django.urls import Resolver404, resolve
 from django.utils.translation import get_language_from_request, gettext_lazy as _
 from menus.base import Modifier, NavigationNode
 from menus.menu_pool import menu_pool
@@ -148,7 +148,10 @@ def modify(self, request, nodes, namespace, root_id, post_cut, breadcrumb):
             app = apphook_pool.get_apphook(request.current_page.application_urls)
 
         if app and app.app_config:
-            namespace = resolve(request.path).namespace
+            try:
+                namespace = resolve(request.path).namespace
+            except Resolver404:  # pragma: no cover
+                return nodes
             if not self._config.get(namespace, False):
                 self._config[namespace] = app.get_config(namespace)
             config = self._config[namespace]

djangocms_blog/cms_plugins.py

@@ -102,7 +102,7 @@ def get_fields(self, request, obj=None):
     def render(self, context, instance, placeholder):
         """Render the plugin."""
         context = super().render(context, instance, placeholder)
-        context["posts_list"] = instance.get_posts(context["request"])
+        context["posts_list"] = instance.get_posts(context["request"], published_only=False)
         context["TRUNCWORDS_COUNT"] = get_setting("POSTS_LIST_TRUNCWORDS_COUNT")
         return context
 

tests/test_plugins.py

@@ -182,10 +182,18 @@ def test_plugin_featured(self):
         self.assertTrue(rendered.find(posts[0].get_absolute_url()) > -1)
         self.assertTrue(rendered.find(posts[1].get_absolute_url()) > -1)
         plugin.posts.remove(posts[1])
-
         rendered = self.render_plugin(pages[0], "en", plugin, edit=True)
         self.assertTrue(rendered.find(posts[0].get_absolute_url()) > -1)
         self.assertFalse(rendered.find(posts[1].get_absolute_url()) > -1)
+        posts[1].publish = False
+        posts[1].save()
+        plugin.posts.add(posts[1])
+        rendered = self.render_plugin(pages[0], "en", plugin, edit=True)
+        self.assertTrue(rendered.find(posts[0].get_absolute_url()) > -1)
+        self.assertTrue(rendered.find(posts[1].get_absolute_url()) > -1)
+        rendered = self.render_plugin(pages[0], "en", plugin, edit=False)
+        self.assertTrue(rendered.find(posts[0].get_absolute_url()) > -1)
+        self.assertFalse(rendered.find(posts[1].get_absolute_url()) > -1)
 
     def test_plugin_tags(self):
         pages = self.get_pages()