Fix: Side-effect on attributes

Author: fsbraun

djangocms_frontend/models.py

@@ -79,12 +79,15 @@ def add_attribute(self, attr, value=None):
 
     def get_attributes(self):
         attributes = self.config.get("attributes", {})
-        classes = set(attributes.get("class", "").split())
-        classes.update(self._additional_classes)
-        if classes:
-            attributes["class"] = " ".join(classes)
-        parts = (f'{item}="{conditional_escape(value)}"' if value else f"{item}" for item, value in attributes.items())
-        attributes_string = " ".join(parts)
+        classes = set(attributes.get("class", "").split())  # classes added in attriutes
+        classes.update(self._additional_classes)  # add additional classes
+        classes = (f'class="{conditional_escape(" ".join(classes))}"') if classes else ""  # to string
+        parts = (
+            f'{item}="{conditional_escape(value)}"' if value else f"{item}"
+            for item, value in attributes.items()
+            if item != "class"
+        )
+        attributes_string = (classes + " ".join(parts)).strip()
         return mark_safe(" " + attributes_string) if attributes_string else ""
 
     def save(self, *args, **kwargs):

tests/test_plugin_tag.py

@@ -24,7 +24,7 @@ def test_tag_rendering_with_paramter(self):
         {% load frontend cms_tags %}
         {% plugin "alert" alert_context="secondary" alert_dismissible=True %}Alert{% endplugin %}
         """)
-        expected_result = """<div class="alert alert-secondary alert-dismissible alert-primary" role="alert">
+        expected_result = """<div class="alert alert-secondary alert-dismissible" role="alert">
         <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button><div>Alert
         </div></div>"""
 
@@ -62,7 +62,7 @@ def test_complex_tags(self):
         expected_result = """
         <div class="card text-primary text-center border-info h-100">
             <div class="text-start card-header"><h4>Card title</h4></div>
-            <div class="card-body text-start text-center card-header">
+            <div class="card-body text-center">
                 Some quick example text to build on the card title and make up the
                 bulk of the card's content.
             </div>