Rename LinkPlugin

Author: fsbraun

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

@@ -1,8 +1,6 @@
 {% load cms_tags easy_thumbnails_tags %}
 {% if instance.rel_image %}
-    {% thumbnail instance.rel_image options.size crop=options.crop upscale=options.upscale subject_location=instance.rel_image.subject_location as thumbnail %}
-
-    <img class="d-block w-100" src="{{ thumbnail.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
+    <img class="d-block mx-auto" style="height: 40vh;" src="{{ instance.rel_image.url }}" alt="{{ instance.rel_image.default_alt_text|default:'' }}" />
 {% else %}
     <div class="d-block w-100"
         style="aspect-ratio: {{ aspect_ratio }}">

djangocms_frontend/contrib/link/cms_plugins.py

@@ -81,7 +81,7 @@ def get_fieldsets(self, request, obj=None):
         return fieldsets
 
 
-class LinkPlugin(mixin_factory("Link"), AttributesMixin, SpacingMixin, LinkPluginMixin, CMSUIPlugin):
+class TextLinkPlugin(mixin_factory("Link"), AttributesMixin, SpacingMixin, LinkPluginMixin, CMSUIPlugin):
     """
     Components > "Button" Plugin
     https://getbootstrap.com/docs/5.0/components/buttons/
@@ -113,7 +113,6 @@ def get_plugin_urls(self):
         ]
 
 
-if "djangocms_frontend.contrib.link" in django_settings.INSTALLED_APPS and "LinkPlugin" not in plugin_pool.plugins:
+if "djangocms_frontend.contrib.link" in django_settings.INSTALLED_APPS:
     #  Only register plugin if in INSTALLED_APPS
-
-    plugin_pool.register_plugin(LinkPlugin)
+    plugin_pool.register_plugin(TextLinkPlugin)

djangocms_frontend/contrib/link/helpers.py

@@ -7,9 +7,6 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import FieldError, ObjectDoesNotExist
 from django.utils.encoding import force_str
-from django.utils.html import mark_safe
-
-from djangocms_frontend.settings import EMPTY_CHOICE
 
 LINK_MODELS = getattr(django_settings, "DJANGOCMS_FRONTEND_LINK_MODELS", [])
 
@@ -62,12 +59,21 @@ def get_object_for_value(value):
     return None
 
 
+def unescape(text, nbsp):
+    return (text.replace(" ", nbsp)
+            .replace("&", "&")
+            .replace("&lt;", "<")
+            .replace("&gt;", ">")
+            .replace("&quot;", '"')
+            .replace("&#x27;", "'"))
+
+
 def get_link_choices(request, term="", lang=None, nbsp=None):
     global _querysets
 
     if nbsp is None:
         nbsp = "" if term else "\u2000"
-    available_objects = [dict(id=EMPTY_CHOICE[0][0], text=EMPTY_CHOICE[0][1])]
+    available_objects = []
     # Now create our list of cms pages
     type_id = ContentType.objects.get_for_model(Page).id
     for value, descr in get_page_choices(lang):
@@ -78,7 +84,9 @@ def get_link_choices(request, term="", lang=None, nbsp=None):
                     "children": [
                         dict(
                             id=f"{type_id}-{page}",
-                            text=mark_safe(name.replace("&nbsp;", nbsp)),
+                            # django admin's autocomplete view requires unescaped strings
+                            # get_page_choices escapes strings, so we undo the escape
+                            text=unescape(name, nbsp),
                         )
                         for page, name in descr
                         if not isinstance(term, str) or term.upper() in name.upper()

djangocms_frontend/contrib/link/migrations/0002_rename_plugin.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.0.6 on 2024-05-22 20:33
+
+from django.db import migrations
+
+
+def rename(apps, old_name, new_name):
+    UIItem = apps.get_model("djangocms_frontend", "FrontendUIItem")
+    UIItem.objects.filter(ui_item=old_name).update(ui_item=new_name, plugin_type=f"{new_name}Plugin")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('link', '0001_initial'),
+    ]
+
+
+    operations = [
+        migrations.RunPython(
+            lambda apps, schema_editor: rename(apps, "Link", "TextLink"),
+            lambda apps, schema_editor: rename(apps, "TextLink", "Link"),
+            elidable=True,
+        ),
+    ]

djangocms_frontend/contrib/navigation/cms_plugins.py

@@ -7,7 +7,7 @@
 from ...common.background import BackgroundMixin
 from ...helpers import first_choice, get_plugin_template, get_template_path
 from .. import navigation
-from ..link.cms_plugins import LinkPlugin, LinkPluginMixin
+from ..link.cms_plugins import LinkPluginMixin, TextLinkPlugin
 from . import forms, models
 
 mixin_factory = settings.get_renderer(navigation)
@@ -166,7 +166,7 @@ class NavContainerPlugin(
 @plugin_pool.register_plugin
 class NavLinkPlugin(
     mixin_factory("NavLink"),
-    LinkPlugin,
+    TextLinkPlugin,
 ):
     """
     A plugin that allows creating navigation links for the frontend.