Merge branch 'main' into fix/provide-plugin-lang-to-change-forms

Author: fsbraun

.github/workflows/codeql.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "main" ]
   schedule:
     - cron: '34 0 * * 1'
 

CHANGELOG.rst

@@ -2,6 +2,25 @@
 Changelog
 =========
 
+2.1.3 (2025-07-20)
+==================
+
+* feat: simpler component configuration  by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/279
+* feat: Add support for ``choices`` in template components. by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/282
+* feat: Make template component folder configurable by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/285
+* fix: AttributeError CMSPlugin (EditorNotePlugin) object has no attribute config by @zbohm in https://github.com/django-cms/djangocms-frontend/pull/280
+* chore: Add test for editor note plugin by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/281
+* chore: Fix some style issues by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/283
+* chore: Introduce dynamic badges from shields.io by @mrbazzan in https://github.com/django-cms/djangocms-frontend/pull/287
+* chore: Move setup info to pyproject.toml exclude docs and tests from wheel by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/290
+* chore: fix column per row not been saved and added tests by @mrbazzan in https://github.com/django-cms/djangocms-frontend/pull/291
+* chore: Increase specificity for admin urls (django 5.2) by @fsbraun in https://github.com/django-cms/djangocms-frontend/pull/278
+
+**New Contributors**
+
+* @zbohm made their first contribution in https://github.com/django-cms/djangocms-frontend/pull/280
+* @mrbazzan made their first contribution in https://github.com/django-cms/djangocms-frontend/pull/287
+
 2.1.2 (2025-05-05)
 ==================
 

djangocms_frontend/__init__.py

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

djangocms_frontend/contrib/carousel/frameworks/bootstrap5.py

@@ -23,7 +23,7 @@ def render(self, context, instance, placeholder):
         instance.add_classes("carousel-item")
         if is_first_child(instance, parent):
             instance.add_classes("active")
-        context["link"] = instance.get_link()
+        context["mixin_link"] = instance.get_link()
         context["aspect_ratio"] = str(width / height)
         context["options"] = {"crop": 10, "size": (width, height), "upscale": True}
         return super().render(context, instance, placeholder)

djangocms_frontend/contrib/carousel/templates/djangocms_frontend/bootstrap5/carousel/default/slide.html

@@ -1,12 +1,12 @@
 {% load cms_tags frontend %}
 <{{ instance.tag_type }}{{ instance.get_attributes }}>
-{% if link %}
-    <a href="{{ link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
+{% if mixin_link %}
+    <a href="{{ mixin_link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}>
 {% endif %}
 {% with image=carousel_image.image %}
     {% include "djangocms_frontend/bootstrap5/carousel/default/image.html" %}
 {% endwith %}
-{% if link %}
+{% if mixin_link %}
     </a>
 {% endif %}
 <div class="carousel-caption d-none d-md-block">

djangocms_frontend/contrib/grid/forms.py

@@ -127,11 +127,11 @@ class Meta:
     )
 
 
-GridRowBaseForm.Meta.entangled_fields["config"] += extra_fields_column.keys()
+GridRowBaseForm._meta.entangled_fields["config"] += extra_fields_column.keys()
 
 
 GridRowForm = type(
-    "GridRowBaseForm",
+    "GridRowForm",
     (GridRowBaseForm,),
     copy(extra_fields_column),
 )
@@ -226,10 +226,10 @@ def clean(self):
         widget=forms.HiddenInput() if "{size}_me" in getattr(settings, "EXCL_COL_PROP", ()) else forms.CheckboxInput(),
     )
 
+GridColumnBaseForm._meta.entangled_fields["config"] += extra_fields_column.keys()
+
 GridColumnForm = type(
     "GridColumnForm",
     (GridColumnBaseForm,),
     copy(extra_fields_column),
 )
-
-GridColumnForm._meta.entangled_fields["config"] += extra_fields_column.keys()

djangocms_frontend/contrib/link/templates/djangocms_frontend/bootstrap5/link/default/link.html

@@ -1 +1 @@
-{% load cms_tags frontend %}{% if mixin_link %}<a href="{{ mixin_link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}{{ instance.get_attributes }}>{% endif %}{% if instance.icon_left %}{% include "djangocms_frontend/bootstrap5/link/default/icon.html" with icon_class=instance.icon_left attribute_class="me-1" %}{% endif %}{% for plugin in instance.child_plugin_instances %}{% render_plugin plugin %}{% empty %}{{ instance.name }}{% endfor %}{% if instance.icon_right %}{% include "djangocms_frontend/bootstrap5/link/default/icon.html" with icon_class=instance.icon_right attribute_class="ms-1" %}{% endif %}{% if link %}</a>{% endif %}
+{% load cms_tags frontend %}{% if mixin_link %}<a href="{{ mixin_link }}"{% if instance.target %} target="{{ instance.target }}"{% endif %}{{ instance.get_attributes }}>{% endif %}{% if instance.icon_left %}{% include "djangocms_frontend/bootstrap5/link/default/icon.html" with icon_class=instance.icon_left attribute_class="me-1" %}{% endif %}{% for plugin in instance.child_plugin_instances %}{% render_plugin plugin %}{% empty %}{{ instance.name }}{% endfor %}{% if instance.icon_right %}{% include "djangocms_frontend/bootstrap5/link/default/icon.html" with icon_class=instance.icon_right attribute_class="ms-1" %}{% endif %}{% if mixin_link %}</a>{% endif %}

tests/carousel/test_plugins.py

@@ -104,3 +104,28 @@ def test_carousel_slide_plugin(self):
             or ('<div class="carousel slide"' in response.content.decode("utf-8")),
             f'<div class="slide carousel" not found in {response.content.decode("utf-8")}',
         )
+
+        # Now testing if links are working
+        row = add_plugin(
+            placeholder=self.placeholder,
+            plugin_type=CarouselPlugin.__name__,
+            language=self.language,
+        )
+        row.initialize_from_form(CarouselForm).save()
+        plugin = add_plugin(
+            target=row,
+            placeholder=self.placeholder,
+            plugin_type=CarouselSlidePlugin.__name__,
+            language=self.language,
+            config=dict(
+                carousel_image=dict(pk=self.image.id, model="filer.Image"),
+                link=dict(external_link="https://www.divio.com"),
+            ),
+        )
+        plugin.initialize_from_form(CarouselSlideForm).save()
+        self.publish(self.page, self.language)
+
+        with self.login_user_context(self.superuser):
+            response = self.client.get(self.request_url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, 'href="https://www.divio.com"')

tests/grid/test_forms.py

@@ -0,0 +1,44 @@
+from django.test import TestCase
+
+from djangocms_frontend.contrib.grid.forms import (
+    GridColumnForm,
+    GridRowForm,
+    GridContainerForm)
+
+
+class GridFormTestCase(TestCase):
+    def test_grid_container_form(self):
+        form = GridContainerForm(data={
+            "container_type": "container",
+            "tag_type": "div",
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+        })
+        self.assertTrue(form.is_valid())
+        self.assertIn("container_type", form.instance.config)
+        self.assertEqual(form.instance.container_type, "container")
+
+    def test_grid_row_form(self):
+        form = GridRowForm(data={
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+            "row_cols_xs": 5,
+        })
+        self.assertTrue(form.is_valid())
+        self.assertIn("row_cols_xs", form.instance.config)
+        self.assertIn("row_cols_xxl", form.instance.config)
+        self.assertEqual(form.instance.row_cols_xs, 5)
+
+    def test_grid_column_form(self):
+        form = GridColumnForm(data={
+            "margin_devices": ['xl'],
+            "padding_devices": ['xs'],
+            "text_alignment": "",
+            "xs_col": "6",
+            "xl_offset": "",
+
+        })
+
+        self.assertTrue(form.is_valid())
+        self.assertIn("md_me", form.instance.config)
+        self.assertEqual(form.instance.xs_col, 6)

tests/test_fields.py

@@ -1,6 +1,10 @@
+from django import forms
 from django.test import TestCase
 
-from djangocms_frontend.fields import AttributesField, TagTypeField, TagTypeFormField
+from djangocms_frontend.settings import DEVICE_CHOICES
+from djangocms_frontend.fields import (
+    AttributesField, TagTypeField,
+    TagTypeFormField, DeviceChoiceField, OptionalDeviceChoiceField)
 
 
 class FieldsTestCase(TestCase):
@@ -31,3 +35,32 @@ def test_tag_type_field(self):
                 ("aside", "aside"),
             ],
         )
+
+    def test_optional_device_choice_field(self):
+        class Form(forms.Form):
+            odc = OptionalDeviceChoiceField()
+            odc_not_required = OptionalDeviceChoiceField(required=False)
+
+        form = Form(data={"odc": [size for size, _ in DEVICE_CHOICES]})
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data["odc"], None)
+
+        form_1 = Form(data={"odc": ['xs', 'sm']})
+        self.assertTrue(form_1.is_valid(), form_1.errors)
+        self.assertEqual(form_1.cleaned_data["odc"], ['xs', 'sm'])
+
+    def test_device_choice_field(self):
+        class Form(forms.Form):
+            dc = DeviceChoiceField()
+
+        class Form2(forms.Form):
+            dc_not_required = DeviceChoiceField(required=False)
+
+        form = Form(data={"dc": ["xs"]})
+        self.assertTrue(form.is_valid(), form.errors)
+        self.assertEqual(form.cleaned_data["dc"], ["xs"])
+
+        form_1 = Form2(data={})
+        self.assertFalse(form_1.is_valid())
+        self.assertFormError(form_1, "dc_not_required",
+                             ["Please select at least one device size"])