From 7fa065c96e69fc8740d3fc3f0295ddc5c7da6419 Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Tue, 20 Aug 2024 07:39:37 +0000 Subject: [PATCH 1/9] fix: `get_absolute_url` method not found while creating new alias and category from wizard button. --- CHANGELOG.rst | 5 +++++ djangocms_alias/cms_wizards.py | 6 ++++++ djangocms_alias/models.py | 5 ++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 00d4da5..65fac84 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog ========= +Unreleased +========== +* fix: `get_absolute_url` method not found while creating new alias and category from wizard button. + + 2.0.1 (2024-03-27) ================== diff --git a/djangocms_alias/cms_wizards.py b/djangocms_alias/cms_wizards.py index bf75516..139104f 100644 --- a/djangocms_alias/cms_wizards.py +++ b/djangocms_alias/cms_wizards.py @@ -12,6 +12,9 @@ class CreateAliasWizard(Wizard): def user_has_add_permission(self, user, **kwargs): return Alias.can_create_alias(user) + + def get_success_url(self, obj, **kwargs): + return obj.get_admin_change_url() class CreateAliasCategoryWizard(Wizard): @@ -19,6 +22,9 @@ def user_has_add_permission(self, user, **kwargs): return user.has_perm( get_model_permission_codename(Category, "add"), ) + + def get_success_url(self, obj, **kwargs): + return obj.get_admin_change_url() create_alias_wizard = CreateAliasWizard( diff --git a/djangocms_alias/models.py b/djangocms_alias/models.py index d7f4148..f56b477 100644 --- a/djangocms_alias/models.py +++ b/djangocms_alias/models.py @@ -17,7 +17,7 @@ from django.utils.translation import gettext_lazy as _ from parler.models import TranslatableModel, TranslatedFields -from .constants import CHANGE_CATEGORY_URL_NAME +from .constants import CHANGE_ALIAS_URL_NAME, CHANGE_CATEGORY_URL_NAME from .utils import is_versioning_enabled __all__ = [ @@ -123,6 +123,9 @@ def name(self): def is_in_use(self): return self.cms_plugins.exists() + def get_admin_change_url(self): + return admin_reverse(CHANGE_ALIAS_URL_NAME, args=[self.pk]) + @cached_property def objects_using(self): objects = set() From 37c1738eb0a327f3c3c4a5d0a45fb7433ac2d5bd Mon Sep 17 00:00:00 2001 From: Josh Yu Date: Tue, 20 Aug 2024 07:41:16 +0000 Subject: [PATCH 2/9] feat: Added search capability in AliasContent admin (migrate the 4.0.x feature from PR #236) --- CHANGELOG.rst | 1 + djangocms_alias/admin.py | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 65fac84..fee4f11 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,7 @@ Changelog Unreleased ========== * fix: `get_absolute_url` method not found while creating new alias and category from wizard button. +* feat: Added search capability in AliasContent admin (migrate the 4.0.x feature from PR #236) 2.0.1 (2024-03-27) diff --git a/djangocms_alias/admin.py b/djangocms_alias/admin.py index f2c13c4..9519a97 100644 --- a/djangocms_alias/admin.py +++ b/djangocms_alias/admin.py @@ -80,6 +80,7 @@ class AliasAdmin(*alias_admin_classes): ) fields = ("content__name", "category", "site", "content__language") readonly_fields = ("static_code",) + search_fields = ["content__name"] form = AliasGrouperAdminForm extra_grouping_fields = ("language",) EMPTY_CONTENT_VALUE = mark_safe(_("Missing language")) From b97a1d94d28a4d767b067a5f9b22509fdcf69464 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 07:46:15 +0000 Subject: [PATCH 3/9] ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci --- djangocms_alias/cms_wizards.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/djangocms_alias/cms_wizards.py b/djangocms_alias/cms_wizards.py index 139104f..a8feccc 100644 --- a/djangocms_alias/cms_wizards.py +++ b/djangocms_alias/cms_wizards.py @@ -12,7 +12,7 @@ class CreateAliasWizard(Wizard): def user_has_add_permission(self, user, **kwargs): return Alias.can_create_alias(user) - + def get_success_url(self, obj, **kwargs): return obj.get_admin_change_url() @@ -22,7 +22,7 @@ def user_has_add_permission(self, user, **kwargs): return user.has_perm( get_model_permission_codename(Category, "add"), ) - + def get_success_url(self, obj, **kwargs): return obj.get_admin_change_url() From e8f9a99f3bbe2cce209b604d27eafe1b5f96e140 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 20 Aug 2024 10:51:44 +0200 Subject: [PATCH 4/9] Update py311-djmain-cms4dev-default.txt --- tests/requirements/py311-djmain-cms4dev-default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/py311-djmain-cms4dev-default.txt b/tests/requirements/py311-djmain-cms4dev-default.txt index 34020ee..94a6a2a 100644 --- a/tests/requirements/py311-djmain-cms4dev-default.txt +++ b/tests/requirements/py311-djmain-cms4dev-default.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.7.2 +asgiref==3.8.1 # via django beautifulsoup4==4.12.2 # via bs4 From 749f13c3efd1bb5c4f747b074805860003420a1d Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 20 Aug 2024 10:52:04 +0200 Subject: [PATCH 5/9] Update py311-djmain-cms4dev-versioning.txt --- tests/requirements/py311-djmain-cms4dev-versioning.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/py311-djmain-cms4dev-versioning.txt b/tests/requirements/py311-djmain-cms4dev-versioning.txt index 34020ee..94a6a2a 100644 --- a/tests/requirements/py311-djmain-cms4dev-versioning.txt +++ b/tests/requirements/py311-djmain-cms4dev-versioning.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.7.2 +asgiref==3.8.1 # via django beautifulsoup4==4.12.2 # via bs4 From 0d4d9c3737a88da9db4349b6c146ce86ac030778 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 20 Aug 2024 10:52:13 +0200 Subject: [PATCH 6/9] Update py311-djmain-cms41-default.txt --- tests/requirements/py311-djmain-cms41-default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/py311-djmain-cms41-default.txt b/tests/requirements/py311-djmain-cms41-default.txt index 0c6caf5..f8fed47 100644 --- a/tests/requirements/py311-djmain-cms41-default.txt +++ b/tests/requirements/py311-djmain-cms41-default.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.7.2 +asgiref==3.8.1 # via django beautifulsoup4==4.12.2 # via bs4 From 055d0e79b603dce446c8a878e087890cd56b7978 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 20 Aug 2024 10:52:21 +0200 Subject: [PATCH 7/9] Update py311-djmain-cms41-versioning.txt --- tests/requirements/py311-djmain-cms41-versioning.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/requirements/py311-djmain-cms41-versioning.txt b/tests/requirements/py311-djmain-cms41-versioning.txt index 0c6caf5..f8fed47 100644 --- a/tests/requirements/py311-djmain-cms41-versioning.txt +++ b/tests/requirements/py311-djmain-cms41-versioning.txt @@ -4,7 +4,7 @@ # # requirements/compile.py # -asgiref==3.7.2 +asgiref==3.8.1 # via django beautifulsoup4==4.12.2 # via bs4 From c81a0ecf9667b06655726d1b0f0b692e69686fc0 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Tue, 20 Aug 2024 10:57:18 +0200 Subject: [PATCH 8/9] Update test_admin.py for Django 5.1+ --- tests/test_admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_admin.py b/tests/test_admin.py index 3125990..6707b5f 100644 --- a/tests/test_admin.py +++ b/tests/test_admin.py @@ -554,9 +554,9 @@ def test_aliases_admin_entry_is_hidden(self): response = self.client.get(index_url) unexpected_content = ( - '' "Alias contents" + '' "Alias contents" ) - expected_content = 'Aliases' + expected_content = 'Aliases' self.assertEqual(response.status_code, 200) self.assertContains(response, expected_content) From dfe42782c405dbe93c30c4c48ee5b1f745c571d2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:59:23 +0000 Subject: [PATCH 9/9] ci: auto fixes from pre-commit hooks for more information, see https://pre-commit.ci --- tests/test_admin.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test_admin.py b/tests/test_admin.py index 6707b5f..c9f616a 100644 --- a/tests/test_admin.py +++ b/tests/test_admin.py @@ -553,9 +553,7 @@ def test_aliases_admin_entry_is_hidden(self): response = self.client.get(index_url) - unexpected_content = ( - '' "Alias contents" - ) + unexpected_content = '' "Alias contents" expected_content = 'Aliases' self.assertEqual(response.status_code, 200)