From ef0199357119f2ae16b15f887a12ee93d78df408 Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:45:52 +0530 Subject: [PATCH 1/6] Update admin.py to point to correct change form template --- djangocms_versioning_filer/admin.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/djangocms_versioning_filer/admin.py b/djangocms_versioning_filer/admin.py index ebd546c..a334789 100644 --- a/djangocms_versioning_filer/admin.py +++ b/djangocms_versioning_filer/admin.py @@ -6,6 +6,9 @@ class VersioningFilerAdminMixin(VersioningAdminMixin): + # Path for filer change form + change_form_template = 'admin/filer/change_form.html' + def get_fieldsets(self, request, obj=None): version = Version.objects.get_for_content(obj) fieldsets = super().get_fieldsets(request, obj) From be2296560945213f07c1b3a7f0ebbdf54fbfcc1b Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:50:06 +0530 Subject: [PATCH 2/6] Update CHANGELOG.rst --- CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 3161dce..ba34f62 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,7 @@ Changelog Unreleased ========== +* fix: Filer admin to point correct change form template 1.2.1 (2022-11-14) ================== From 4e233df8c20c873d60cd63d1bbcdcd72a6f3db9f Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:58:20 +0530 Subject: [PATCH 3/6] Removing blank space --- djangocms_versioning_filer/admin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/djangocms_versioning_filer/admin.py b/djangocms_versioning_filer/admin.py index a334789..e071d99 100644 --- a/djangocms_versioning_filer/admin.py +++ b/djangocms_versioning_filer/admin.py @@ -8,7 +8,6 @@ class VersioningFilerAdminMixin(VersioningAdminMixin): # Path for filer change form change_form_template = 'admin/filer/change_form.html' - def get_fieldsets(self, request, obj=None): version = Version.objects.get_for_content(obj) fieldsets = super().get_fieldsets(request, obj) From c0eae13dbfbe2cc787801777d4affb8d276c6248 Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:24:08 +0530 Subject: [PATCH 4/6] added new line in admin.py --- djangocms_versioning_filer/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/djangocms_versioning_filer/admin.py b/djangocms_versioning_filer/admin.py index e071d99..ef1a3cd 100644 --- a/djangocms_versioning_filer/admin.py +++ b/djangocms_versioning_filer/admin.py @@ -8,6 +8,7 @@ class VersioningFilerAdminMixin(VersioningAdminMixin): # Path for filer change form change_form_template = 'admin/filer/change_form.html' + def get_fieldsets(self, request, obj=None): version = Version.objects.get_for_content(obj) fieldsets = super().get_fieldsets(request, obj) From f63677af4b9020f89001cb7d6c2b1cff605c42e5 Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:18:22 +0530 Subject: [PATCH 5/6] Pinning djangocms versioning -1.2.2 for unittesting --- tests/requirements/requirements_base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt index c5d076c..0dfdd4d 100644 --- a/tests/requirements/requirements_base.txt +++ b/tests/requirements/requirements_base.txt @@ -2,6 +2,7 @@ coverage django-app-helper django-filer==2.2.3 djangocms-audio +djangocms-versioning==1.2.2 djangocms-video factory-boy flake8 @@ -11,5 +12,4 @@ mock # Unreleased django-cms 4.0 compatible packages https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms -https://github.com/django-cms/djangocms-versioning/tarball/master#egg=djangocms-versioning https://github.com/Aiky30/djangocms-moderation/tarball/master#egg=djangocms-moderation From c6e2abe51fd83b69cbf396fefe2a1129379ea419 Mon Sep 17 00:00:00 2001 From: vipulnarang95 <61502917+vipulnarang95@users.noreply.github.com> Date: Fri, 21 Jul 2023 16:28:25 +0530 Subject: [PATCH 6/6] Update requirements_base.txt pointing to djangocms 4.0.x branch --- tests/requirements/requirements_base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/requirements_base.txt b/tests/requirements/requirements_base.txt index 0dfdd4d..9f572dc 100644 --- a/tests/requirements/requirements_base.txt +++ b/tests/requirements/requirements_base.txt @@ -2,7 +2,6 @@ coverage django-app-helper django-filer==2.2.3 djangocms-audio -djangocms-versioning==1.2.2 djangocms-video factory-boy flake8 @@ -12,4 +11,5 @@ mock # Unreleased django-cms 4.0 compatible packages https://github.com/django-cms/django-cms/tarball/release/4.0.1.x#egg=django-cms +https://github.com/django-cms/djangocms-versioning/tarball/support/django-cms-4.0.x#egg=djangocms-versioning https://github.com/Aiky30/djangocms-moderation/tarball/master#egg=djangocms-moderation