From d2de50ed525af62ee825a7af403903ade1275302 Mon Sep 17 00:00:00 2001 From: Vipul Narang Date: Thu, 6 Jun 2024 12:18:36 +0530 Subject: [PATCH 1/4] Fix editlink in pageadmin to close sideframe --- CHANGELOG.rst | 3 +++ djangocms_pageadmin/admin.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index ba51be2..2bb1ae5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog ========= +Unreleased +================= +* Fixed edit link in pageadmin to close sideframe 1.7.0 (2024-05-16) ================== diff --git a/djangocms_pageadmin/admin.py b/djangocms_pageadmin/admin.py index 1171947..e239476 100644 --- a/djangocms_pageadmin/admin.py +++ b/djangocms_pageadmin/admin.py @@ -260,9 +260,10 @@ def _get_edit_link(self, obj, request, disabled=False): args=(version.pk,), ) + # close sideframe as edit will always be on page and not in sideframe return render_to_string( "djangocms_pageadmin/admin/icons/edit.html", - {"url": url, "disabled": disabled, "get": False}, + {"url": url, "disabled": disabled, "get": False, "keepsideframe": False}, ) def _get_duplicate_link(self, obj, request, disabled=False): From e201c5f60238c4eaf8ed521d15cc4d21d7fb377c Mon Sep 17 00:00:00 2001 From: Vipul Narang Date: Thu, 6 Jun 2024 14:21:23 +0530 Subject: [PATCH 2/4] bump version to 1.8.0 --- CHANGELOG.rst | 2 +- djangocms_pageadmin/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 2bb1ae5..03c482c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,7 @@ Changelog ========= -Unreleased +1.8.0 (2024-06-06) ================= * Fixed edit link in pageadmin to close sideframe diff --git a/djangocms_pageadmin/__init__.py b/djangocms_pageadmin/__init__.py index 0246eaf..dc73eeb 100644 --- a/djangocms_pageadmin/__init__.py +++ b/djangocms_pageadmin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.7.0" +__version__ = "1.8.0" default_app_config = "djangocms_pageadmin.apps.PageAdminConfig" From 2fc06041302a03c02b229312d536faf85ec3fe11 Mon Sep 17 00:00:00 2001 From: Vipul Narang <61502917+vipulnarang95@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:53:59 +0530 Subject: [PATCH 3/4] Update CHANGELOG.rst --- CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 03c482c..39adc48 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,7 +2,7 @@ Changelog ========= -1.8.0 (2024-06-06) +1.7.1 (2024-06-06) ================= * Fixed edit link in pageadmin to close sideframe From b17b52458e8b6950b818c5bc71e3d45f428a5efd Mon Sep 17 00:00:00 2001 From: Vipul Narang <61502917+vipulnarang95@users.noreply.github.com> Date: Thu, 6 Jun 2024 14:54:26 +0530 Subject: [PATCH 4/4] Update __init__.py --- djangocms_pageadmin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_pageadmin/__init__.py b/djangocms_pageadmin/__init__.py index dc73eeb..199a8dd 100644 --- a/djangocms_pageadmin/__init__.py +++ b/djangocms_pageadmin/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.8.0" +__version__ = "1.7.1" default_app_config = "djangocms_pageadmin.apps.PageAdminConfig"