Fix: Carousel links

Author: fsbraun

djangocms_frontend/contrib/carousel/cms_plugins.py

@@ -81,18 +81,8 @@ class CarouselSlidePlugin(
                 )
             },
         ),
-        (
-            _("Link settings"),
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    ("external_link", "internal_link"),
-                    ("mailto", "phone"),
-                    ("anchor", "target"),
-                ),
-            },
-        ),
     ]
+    link_fieldset_position = 1
 
     def get_render_template(self, context, instance, placeholder):
         return get_plugin_template(

djangocms_frontend/contrib/carousel/forms.py

@@ -18,7 +18,7 @@
 from ...helpers import first_choice
 from ...models import FrontendUIItem
 from .. import carousel
-from ..link.forms import AbstractLinkForm
+from ..link.forms import LinkFormMixin
 from .constants import (
     CAROUSEL_ASPECT_RATIO_CHOICES,
     CAROUSEL_PAUSE_CHOICES,
@@ -143,8 +143,8 @@ class Meta:
 
 class CarouselSlideForm(
     mixin_factory("CarouselSlide"),
-    AbstractLinkForm,
     BackgroundFormMixin,
+    LinkFormMixin,
     EntangledModelForm,
 ):
     """

djangocms_frontend/contrib/link/forms.py

@@ -5,7 +5,7 @@
 from djangocms_link.fields import LinkFormField
 
 # from djangocms_link.validators import IntranetURLValidator
-from entangled.forms import EntangledModelForm
+from entangled.forms import EntangledModelForm, EntangledModelFormMixin
 
 from ... import settings
 from ...common import SpacingFormMixin
@@ -46,7 +46,7 @@ def __init__(self, *args, **kwargs):
     )
     from djangocms_url_manager.models import UrlGrouper
 
-    class AbstractLinkForm(EntangledModelForm):
+    class LinkFormMixin(EntangledModelFormMixin):
         class Meta:
             entangled_fields = {
                 "config": [
@@ -70,7 +70,7 @@ class Meta:
 
 else:
 
-    class AbstractLinkForm(EntangledModelForm):
+    class LinkFormMixin(EntangledModelFormMixin):
         class Meta:
             entangled_fields = {
                 "config": [
@@ -97,6 +97,10 @@ def __init__(self, *args, **kwargs):
             self.fields["link"].required = not self.link_is_optional
 
 
+class AbstractLinkForm(LinkFormMixin, EntangledModelForm):
+    pass
+
+
 class LinkForm(mixin_factory("Link"), SpacingFormMixin, TemplateChoiceMixin, AbstractLinkForm):
     class Meta:
         model = FrontendUIItem