Skip to content

Commit 40a8b7d

Browse files
committed
fix: enangled form inheritance error
1 parent 9d1d400 commit 40a8b7d

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

djangocms_frontend/apps.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ class DjangocmsFrontendConfig(apps.AppConfig):
77
verbose_name = "django CMS Frontend"
88

99
def ready(self):
10-
from . import plugin_tag
11-
from . import component_pool
10+
from . import component_pool, plugin_tag
1211

1312
component_pool.setup()
1413
plugin_tag.setup()

djangocms_frontend/component_base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@ def get_short_description(self) -> str:
225225
def save_model(self, request, obj, form: forms.Form, change: bool) -> None:
226226
"""Auto-creates slot plugins upon creation of component plugin instance"""
227227
from cms.api import add_plugin
228+
228229
from .ui_plugin_base import CMSUIComponent
229230

230231
super(CMSUIComponent, self).save_model(request, obj, form, change)

djangocms_frontend/component_pool.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
from collections import defaultdict
2-
from collections.abc import Iterator
31
import importlib
42
import os
53
import warnings
4+
from collections import defaultdict
5+
from collections.abc import Iterator
66

77
from django import forms
88
from django.apps import apps
99
from django.template.loader import get_template
1010
from django.utils.module_loading import autodiscover_modules
11-
1211
from sekizai.context import SekizaiContext
1312

1413
from djangocms_frontend import settings

djangocms_frontend/contrib/grid/forms.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ class Meta:
136136
copy(extra_fields_column),
137137
)
138138

139+
GridRowForm._meta.model = FrontendUIItem # Potentially a django-entangled bug?
140+
139141

140142
class GridColumnBaseForm(
141143
mixin_factory("GridColumn"),
@@ -233,3 +235,5 @@ def clean(self):
233235
(GridColumnBaseForm,),
234236
copy(extra_fields_column),
235237
)
238+
239+
GridColumnForm._meta.model = FrontendUIItem # Potentially a django-entangled bug?

djangocms_frontend/fields.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from . import settings
1010
from .helpers import first_choice
1111

12-
1312
if apps.is_installed("djangocms_text"):
1413
from djangocms_text.fields import HTMLFormField # noqa F401
1514

djangocms_frontend/templatetags/cms_component.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
from __future__ import annotations
2+
23
import re
4+
35
from django import forms, template
46

57
register = template.Library()

0 commit comments

Comments
 (0)