Merge branch 'django-cms:master' into master

Author: fsbraun

CHANGELOG.rst

@@ -2,6 +2,13 @@
 Changelog
 =========
 
+1.3.2 (2024-04-25)
+==================
+
+* fix: make grid layout (rows/columns) compatible with flex box-based Django admin by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/208
+* fix: Improved handling of optional smart link field by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/210
+
+
 1.3.1 (2024-04-12)
 ==================
 

djangocms_frontend/__init__.py

@@ -19,4 +19,4 @@
 13. Github actions will publish the new package to pypi
 """
 
-__version__ = "1.3.1"
+__version__ = "1.3.2"

djangocms_frontend/common/attributes.py

@@ -16,9 +16,7 @@ class AttributesMixin:
 
     def get_fieldsets(self, request, obj=None):
         meta = self.form._meta
-        fields = (
-            ["tag_type"] if "tag_type" in getattr(meta, "untangled_fields", ()) else []
-        )
+        fields = ["tag_type"] if "tag_type" in getattr(meta, "untangled_fields", ()) else []
         fields.append("attributes")
         return insert_fields(
             super().get_fieldsets(request, obj),

djangocms_frontend/common/bootstrap5/background.py

@@ -47,9 +47,7 @@ class Meta:
     background_context = forms.ChoiceField(
         label=_("Background context"),
         required=False,
-        choices=settings.EMPTY_CHOICE
-        + settings.COLOR_STYLE_CHOICES
-        + (("transparent", _("Transparent")),),
+        choices=settings.EMPTY_CHOICE + settings.COLOR_STYLE_CHOICES + (("transparent", _("Transparent")),),
         initial=settings.EMPTY_CHOICE[0][0],
         widget=ColoredButtonGroup(),
     )

djangocms_frontend/common/bootstrap5/sizing.py

@@ -46,17 +46,13 @@ class Meta:
         initial=settings.EMPTY_CHOICE[0][0],
         choices=settings.EMPTY_CHOICE + settings.SIZE_X_CHOICES,
         #        widget=ButtonGroup(attrs=dict(property="text")),
-        help_text=_(
-            "Sets the horizontal size relative to the surrounding container or the viewport."
-        ),
+        help_text=_("Sets the horizontal size relative to the surrounding container or the viewport."),
     )
     size_y = forms.ChoiceField(
         label=_("Vertical size"),
         required=False,
         initial=settings.EMPTY_CHOICE[0][0],
         choices=settings.EMPTY_CHOICE + settings.SIZE_Y_CHOICES,
         #       widget=ButtonGroup(attrs=dict(property="text")),
-        help_text=_(
-            "Sets the vertical size relative to the surrounding container or the viewport."
-        ),
+        help_text=_("Sets the vertical size relative to the surrounding container or the viewport."),
     )

djangocms_frontend/common/spacing.py

@@ -28,12 +28,7 @@ def __init__(self, **kwargs):
         self.side_choices = kwargs.pop("side_choices")
         super().__init__(
             [
-                IconGroup(
-                    choices=[
-                        (self.property + side, verbose)
-                        for side, verbose in self.side_choices
-                    ]
-                ),
+                IconGroup(choices=[(self.property + side, verbose) for side, verbose in self.side_choices]),
                 DivSelectWidget(choices=kwargs.pop("size_choices")),
             ],
             **kwargs,

djangocms_frontend/common/title.py

@@ -36,9 +36,7 @@ def __init__(self, *args, **kwargs):
 
     def clean(self, value):
         if value[0] and not value[1]:
-            raise ValidationError(
-                _("Please add a title if you want to publish it."), code="incomplete"
-            )
+            raise ValidationError(_("Please add a title if you want to publish it."), code="incomplete")
         return super().clean(value)
 
     def compress(self, data_list):

djangocms_frontend/contrib/accordion/frameworks/bootstrap5.py

@@ -15,9 +15,5 @@ def render(self, context, instance, placeholder):
         instance.add_classes("accordion-collapse collapse")
         if instance.accordion_item_open:
             instance.add_classes("show")
-        instance.font_size = (
-            context["parent"]
-            .config.get("accordion_header_type", "")
-            .replace("h", "fs-")
-        )
+        instance.font_size = context["parent"].config.get("accordion_header_type", "").replace("h", "fs-")
         return super().render(context, instance, placeholder)

djangocms_frontend/contrib/alert/cms_plugins.py

@@ -13,9 +13,7 @@
 
 
 @plugin_pool.register_plugin
-class AlertPlugin(
-    mixin_factory("Alert"), AttributesMixin, ResponsiveMixin, SpacingMixin, CMSUIPlugin
-):
+class AlertPlugin(mixin_factory("Alert"), AttributesMixin, ResponsiveMixin, SpacingMixin, CMSUIPlugin):
     """
     Components > "Alerts" Plugin
     https://getbootstrap.com/docs/5.0/components/alerts/

djangocms_frontend/contrib/alert/forms.py

@@ -18,9 +18,7 @@
 mixin_factory = settings.get_forms(alert)
 
 
-class AlertForm(
-    mixin_factory("Alert"), ResponsiveFormMixin, SpacingFormMixin, EntangledModelForm
-):
+class AlertForm(mixin_factory("Alert"), ResponsiveFormMixin, SpacingFormMixin, EntangledModelForm):
     """
     Components > "Alerts" Plugin
     https://getbootstrap.com/docs/5.0/components/alerts/