From cac615af85977ab412bc41a9aab02dcbfd3ddb09 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 10 Feb 2016 10:06:40 +0100 Subject: [PATCH 1/2] Use all_languages_column from parler 1.5, bump deps accordingly --- djangocms_blog/admin.py | 4 +++- setup.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/djangocms_blog/admin.py b/djangocms_blog/admin.py index c2fa423..99df7c8 100755 --- a/djangocms_blog/admin.py +++ b/djangocms_blog/admin.py @@ -25,6 +25,7 @@ except ImportError: class BlogCategoryAdmin(EnhancedModelAdminMixin, ModelAppHookConfig, TranslatableAdmin): + def get_prepopulated_fields(self, request, obj=None): app_config_default = self._app_config_select(request, obj) if app_config_default is None and request.method == 'GET': @@ -41,7 +42,8 @@ class PostAdmin(PlaceholderAdminMixin, FrontendEditableAdminMixin, ModelAppHookConfig, TranslatableAdmin): form = PostAdminForm list_display = [ - 'title', 'author', 'date_published', 'app_config', 'languages', 'date_published_end' + 'title', 'author', 'date_published', 'app_config', 'all_languages_column', + 'date_published_end' ] list_filter = ('app_config',) date_hierarchy = 'date_published' diff --git a/setup.py b/setup.py index 8f92519..ee00b55 100755 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( ], include_package_data=True, install_requires=[ - 'django-parler>=1.2', + 'django-parler>=1.5', 'django-cms>3.0.11', 'django-taggit>=0.12.2', 'django-filer', From 9e315d47216c6c95a8956fce386a37e6646c67e0 Mon Sep 17 00:00:00 2001 From: Iacopo Spalletti Date: Wed, 10 Feb 2016 10:10:09 +0100 Subject: [PATCH 2/2] Edit history --- HISTORY.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/HISTORY.rst b/HISTORY.rst index 5149e65..0bcac81 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -8,6 +8,7 @@ History * Make categories non required * Fix tests with parler>=1.6 +* Use all_languages_column to admin 0.6.3 (2015-12-22) ++++++++++++++++++