Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions djangocms_frontend/component_pool.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ def find_cms_component_templates() -> list[tuple[str, str]]:

class CMSAutoComponentDiscovery:
default_field_context = {
"djanghocms_text": "djangocms_text.fields.TextFormField",
"djanghocms_text_ckeditor": "djangocms_text_ckeditor.fields.TextFormField",
"djangocms_text": "djangocms_text.fields.HTMLFormField",
"djangocms_text_ckeditor": "djangocms_text_ckeditor.fields.HTMLFormField",
"djangocms_link": "djangocms_link.fields.LinkFormField",
"djangocms_frontend": [
"djangocms_frontend.contrib.image.fields.ImageFormField",
Expand Down Expand Up @@ -141,9 +141,10 @@ def setup():
update_plugin_pool()
components._discovered = True

if text_config := apps.get_app_config("djangocms_text"):
if apps.is_installed("djangocms_text"):
# Hack - update inline editable fields in case djangocms_text is installed
# BEFORE djangocms_frontend in INSTALLED_APPS
text_config = apps.get_app_config("djangocms_text")
if text_config.inline_models:
# Already initialized? Need to initialize again
# to reflect inline fields in of just discovered components
Expand Down