Skip to content

Commit 9652cfa

Browse files
committed
Merge branch 'feat/auto-components' of github.com:django-cms/djangocms-frontend into feat/auto-components
2 parents 7ab4baf + 520fa05 commit 9652cfa

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

djangocms_frontend/component_pool.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ def scan_templates_for_component_declaration(
9797
logger.error(
9898
f"Error rendering template {template_name} to scan for cms frontend components", exc_info=True
9999
)
100-
pass
101100

102101

103102
class Components:

djangocms_frontend/ui_plugin_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def render(self, context, instance, placeholder):
3434
if isinstance(value, dict) and set(value.keys()) == {"pk", "model"}:
3535
if key not in instance.__dir__(): # hasattr would return the value in the config dict
3636
setattr(instance.__class__, key, get_related(key))
37-
if "instance" not in instance.config:
37+
if "instance" not in instance.config and isinstance(instance.config, dict):
3838
context.update(instance.config)
3939
return super().render(context, instance, placeholder)
4040

docs/source/tutorial/custom_components.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ they are used in different custom apps.
3434
Directory Structure
3535
-------------------
3636

37-
Custom components live in the ``cms_componenty`` module of any of your apps.
37+
Custom components live in the ``cms_components`` module of any of your apps.
3838
Ensure your app has the following structure::
3939

4040
theme/

docs/source/tutorial/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ that gets the job done for your project.
2323
needed. This is the fastest approach to create djangocms-frontend components.
2424
Template-based (or auto) components are auto-detected.
2525

26-
3. **Custom Component Development** – A more advanced method that lets you create
26+
3. **Custom component development** – A more advanced method that lets you create
2727
custom components with **minimal code**. This approach is more flexible than the
2828
template-based method, but requires some Python coding providing more control over
2929
the components add and change forms, for example.

docs/source/tutorial/template_components.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ The fields declared earlier (``title``, ``slogan``, and ``hero_image``) are now
141141
The ``{% childplugins %}`` block allows additional CMS plugins (like buttons) to be added inside the component
142142
in the structure editor.
143143

144-
Make the component avialabvle in django CMS
144+
Make the component available in django CMS
145145
-------------------------------------------
146146

147147
Template components are discovered automatically - no more coding is required. If you change the declarative

0 commit comments

Comments
 (0)