From 2b556e41b9872787f528cfd4e6f0f8bf38c913ae Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Thu, 6 Feb 2025 19:11:45 +0100 Subject: [PATCH 1/2] fix: Django 6 tried to adding object tools to the page tree throwing an error (#8133) * fix: Django 6 tried to add an Add page through the object tools and throws an error * Clearer formatting --------- Co-authored-by: Vinit Kumar --- cms/templates/admin/cms/page/tree/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/templates/admin/cms/page/tree/base.html b/cms/templates/admin/cms/page/tree/base.html index 778c7057682..9223c9c93cf 100644 --- a/cms/templates/admin/cms/page/tree/base.html +++ b/cms/templates/admin/cms/page/tree/base.html @@ -30,8 +30,8 @@ {% endblock %} {% endif %} - {% block content_title %}{% endblock %} +{% block object-tools-items %}{% endblock %} {% block content %} {% spaceless %} From 78c3b245b4fa4ad80a1a14735936b13ee337d104 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Thu, 17 Apr 2025 01:00:34 +0200 Subject: [PATCH 2/2] Update github actions to latest ubuntu --- .github/workflows/frontend.yml | 2 +- .github/workflows/test_startcmsproject.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 2ad96c83fa1..b2cf1c20d8e 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -8,7 +8,7 @@ concurrency: jobs: frontend: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest strategy: matrix: node-version: ['18'] diff --git a/.github/workflows/test_startcmsproject.yml b/.github/workflows/test_startcmsproject.yml index 8638e025a51..504a12179c3 100644 --- a/.github/workflows/test_startcmsproject.yml +++ b/.github/workflows/test_startcmsproject.yml @@ -18,7 +18,7 @@ jobs: python-version: ['3.11'] requirements-file: ['requirements_base.txt'] os: [ - ubuntu-20.04, + ubuntu-latest, ] steps: