diff --git a/cms/extensions/__init__.py b/cms/extensions/__init__.py index e535ffe4..5b097aab 100644 --- a/cms/extensions/__init__.py +++ b/cms/extensions/__init__.py @@ -2,10 +2,18 @@ from .admin import PageContentExtensionAdmin, PageExtensionAdmin from .extension_pool import extension_pool from .models import PageContentExtension, PageExtension + +# Legacy django-cms compatibility +TitleExtension = PageContentExtension +TitleExtensionAdmin = PageContentExtensionAdmin + + __all__ = [ 'extension_pool', 'PageContentExtension', 'PageContentExtensionAdmin', 'PageExtension', - 'PageExtensionAdmin' -] + 'PageExtensionAdmin', + 'TitleExtension', + 'TitleExtensionAdmin', +] \ No newline at end of file diff --git a/cms/models/__init__.py b/cms/models/__init__.py index b92d3090..9365fbd1 100644 --- a/cms/models/__init__.py +++ b/cms/models/__init__.py @@ -9,5 +9,9 @@ from .contentmodels import * # noqa: F401,F403 from .placeholderpluginmodel import * # noqa: F401,F403 from .aliaspluginmodel import * # noqa: F401,F403 from .apphooks_reload import * # noqa: F401,F403 + +# Legacy django-cms compatibility +Title = PageContent + # must be last -from cms import signals as s_import # noqa: F401 +from cms import signals as s_import # noqa: F401 \ No newline at end of file diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index 525d9f03..d9392c94 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -116,25 +116,25 @@ INSTALLED_APPS = ( 'aldryn_common', 'aldryn_newsblog', 'aldryn_people', - #TODO'aldryn_reversion', - #TODO'aldryn_translation_tools', + #TODO: 'aldryn_reversion', + 'aldryn_translation_tools', 'treebeard', # utilities for implementing a tree 'sekizai', # for javascript and css management 'menus', # helper for model independent hierarchical website navigation - #TODO'cmsplugin_filer_image', + 'cmsplugin_filer_image', # 2nd migrate # django-cms plugins 'djangocms_file', - #TODO'djangocms_picture', - #TODO'djangocms_video', - #TODO'django_recaptcha', + 'djangocms_picture', + 'djangocms_video', + 'django_recaptcha', # 'djangocms_flash', # 'djangocms_googlemap', # 'djangocms_inherit', # 'djangocms_link', # 'djangocms_teaser', - #TODO 'djangocms_page_meta', + 'djangocms_page_meta', #TODO'djangocms_text_ckeditor', #TODO'cmsplugin_filer_file', #TODO'cmsplugin_filer_folder', diff --git a/legacy_compat.py b/legacy_compat.py index b91ff8f6..717fc065 100644 --- a/legacy_compat.py +++ b/legacy_compat.py @@ -529,3 +529,20 @@ from django.template.library import Library if not hasattr(Library, "assignment_tag"): Library.assignment_tag = Library.simple_tag + + +# --------------------------------------------------------------------------- +# django-filer / old cmsplugin-filer-image compatibility +# --------------------------------------------------------------------------- + +try: + import filer.utils.compatibility as filer_compat + + if not hasattr(filer_compat, "python_2_unicode_compatible"): + def python_2_unicode_compatible(cls): + return cls + + filer_compat.python_2_unicode_compatible = python_2_unicode_compatible + +except ImportError: + pass \ No newline at end of file diff --git a/updated_requirements.txt b/updated_requirements.txt index 4249e140..491a02bc 100644 --- a/updated_requirements.txt +++ b/updated_requirements.txt @@ -18,12 +18,13 @@ click==8.5.0 click-didyoumean==0.3.1 click-plugins==1.1.1.2 click-repl==0.4.0 +cmsplugin-filer==1.1.3 Django==6.1.1 django-appconf==1.2.0 django-appdata==0.4.0 django-bootstrap3==26.2 django-classy-tags==0.8.0 -django-cms==5.1.3 +django-cms==3.11.11 django-debug-toolbar==8.0.0 django-filer==3.6.0 django-formtools==2.1 @@ -53,7 +54,10 @@ djangocms-apphook-setup==0.5.1 djangocms-attributes-field==4.1.2 djangocms-file==4.0.1 djangocms-multisite==0.3.1 +djangocms-page-meta==1.4.5 +djangocms-picture==4.1.1 djangocms-text-ckeditor==5.1.7 +djangocms-video==3.1.0 djangorestframework==3.18.1 easy-thumbnails==2.10.1 html5lib==1.1