diff --git a/djangocms_text/cms_plugins.py b/djangocms_text/cms_plugins.py index e4c62693..829321e1 100644 --- a/djangocms_text/cms_plugins.py +++ b/djangocms_text/cms_plugins.py @@ -2,7 +2,6 @@ import operator import re -from cms.utils import get_language_from_request from django.apps import apps from django.contrib.admin.utils import unquote from django.core import signing @@ -10,11 +9,7 @@ from django.db import transaction from django.forms.fields import CharField from django.http import ( - Http404, - HttpResponse, - HttpResponseBadRequest, - HttpResponseForbidden, - HttpResponseRedirect, JsonResponse, + Http404, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseRedirect, JsonResponse, ) from django.shortcuts import get_object_or_404 from django.template import RequestContext @@ -26,12 +21,16 @@ from django.views.decorators.http import require_POST from cms.models import CMSPlugin, Page +from cms.utils import get_language_from_request + +from .settings import TEXT_CHILDREN_ENABLED try: from cms.models import PageContent except ImportError: from cms.models import Title as PageContent + from cms.plugin_base import CMSPluginBase from cms.plugin_pool import plugin_pool from cms.utils.placeholder import get_placeholder_conf @@ -42,15 +41,8 @@ from .html import render_dynamic_attributes from .models import Text from .utils import ( - OBJ_ADMIN_WITH_CONTENT_RE_PATTERN, - _plugin_tags_to_html, - cms_placeholder_add_plugin, - plugin_tags_to_admin_html, - plugin_tags_to_id_list, - plugin_tags_to_user_html, - plugin_to_tag, - random_comment_exempt, - replace_plugin_tags, + OBJ_ADMIN_WITH_CONTENT_RE_PATTERN, _plugin_tags_to_html, cms_placeholder_add_plugin, plugin_tags_to_admin_html, + plugin_tags_to_id_list, plugin_tags_to_user_html, plugin_to_tag, random_comment_exempt, replace_plugin_tags, ) from .widgets import TextEditorWidget, rte_config @@ -597,7 +589,7 @@ def render_plugin_icon(self, plugin): def get_plugins(self, obj=None): plugin = getattr(self, "cms_plugin_instance", None) or obj - if not plugin: + if not plugin or not TEXT_CHILDREN_ENABLED: return [] get_plugin = plugin_pool.get_plugin child_plugin_types = self.get_child_classes( diff --git a/djangocms_text/contrib/text_ckeditor4/__init__.py b/djangocms_text/contrib/text_ckeditor4/__init__.py index 2a82fa2e..51d3fd46 100644 --- a/djangocms_text/contrib/text_ckeditor4/__init__.py +++ b/djangocms_text/contrib/text_ckeditor4/__init__.py @@ -1,5 +1,6 @@ from djangocms_text.editors import RTEConfig + ckeditor4 = RTEConfig( name="ckeditor4", config="CKEDITOR", diff --git a/djangocms_text/contrib/text_ckeditor5/__init__.py b/djangocms_text/contrib/text_ckeditor5/__init__.py index 9c3d5fcd..2678d8c4 100644 --- a/djangocms_text/contrib/text_ckeditor5/__init__.py +++ b/djangocms_text/contrib/text_ckeditor5/__init__.py @@ -1,5 +1,6 @@ from djangocms_text.editors import RTEConfig + ckeditor5 = RTEConfig( name="ckeditor5", config="CKEDITOR5", diff --git a/djangocms_text/editors.py b/djangocms_text/editors.py index ed281ba3..5a3e40ad 100644 --- a/djangocms_text/editors.py +++ b/djangocms_text/editors.py @@ -1,13 +1,10 @@ from typing import Iterable, Optional from django.conf import settings - - -from django.utils.translation import gettext_lazy as _ - -from django.utils.functional import Promise -from django.utils.encoding import force_str from django.core.serializers.json import DjangoJSONEncoder +from django.utils.encoding import force_str +from django.utils.functional import Promise +from django.utils.translation import gettext_lazy as _ class LazyEncoder(DjangoJSONEncoder): diff --git a/djangocms_text/html.py b/djangocms_text/html.py index 32f8981d..d9867be6 100644 --- a/djangocms_text/html.py +++ b/djangocms_text/html.py @@ -6,12 +6,11 @@ from copy import deepcopy from typing import Optional, Union -import nh3 from django.apps import apps -from lxml import etree - from django.db import models +import nh3 +from lxml import etree from lxml.etree import Element from . import settings diff --git a/djangocms_text/models.py b/djangocms_text/models.py index 6a152144..c3207000 100644 --- a/djangocms_text/models.py +++ b/djangocms_text/models.py @@ -10,12 +10,7 @@ from . import settings from .html import clean_html, extract_images -from .utils import ( - plugin_tags_to_db, - plugin_tags_to_id_list, - plugin_to_tag, - replace_plugin_tags, -) +from .utils import plugin_tags_to_db, plugin_tags_to_id_list, plugin_to_tag, replace_plugin_tags try: diff --git a/djangocms_text/widgets.py b/djangocms_text/widgets.py index 5207d4ea..f3fd32bb 100644 --- a/djangocms_text/widgets.py +++ b/djangocms_text/widgets.py @@ -14,8 +14,9 @@ from cms.utils.urlutils import admin_reverse, static_with_version from . import settings as text_settings -from .editors import DEFAULT_TOOLBAR_CMS, DEFAULT_TOOLBAR_HTMLField, LazyEncoder, get_editor_base_config -from .editors import get_editor_config +from .editors import ( + DEFAULT_TOOLBAR_CMS, DEFAULT_TOOLBAR_HTMLField, LazyEncoder, get_editor_base_config, get_editor_config, +) from .utils import cms_placeholder_add_plugin